From 4a4f65fe511b85bcbfa06b7428f0a0edca8b0b9f Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 31 Jan 2022 23:00:10 +1100 Subject: [PATCH] CMake: [nfc] uppercase 'RapidXml_*' variables Upcoming changes that introduce `cmake-format` checks complain that these identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`. --- cmake/FindRAPIDXML.cmake | 6 ++++++ cmake/FindRapidXml.cmake | 6 ------ tests/CMakeLists.txt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 cmake/FindRAPIDXML.cmake delete mode 100644 cmake/FindRapidXml.cmake diff --git a/cmake/FindRAPIDXML.cmake b/cmake/FindRAPIDXML.cmake new file mode 100644 index 000000000..7b99e4264 --- /dev/null +++ b/cmake/FindRAPIDXML.cmake @@ -0,0 +1,6 @@ +find_path(RAPIDXML_INCLUDE_DIR rapidxml_ns/rapidxml_ns.hpp) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(RAPIDXML DEFAULT_MSG RAPIDXML_INCLUDE_DIR) + +set(RAPIDXML_INCLUDE_DIRS ${RAPIDXML_INCLUDE_DIR}) diff --git a/cmake/FindRapidXml.cmake b/cmake/FindRapidXml.cmake deleted file mode 100644 index ae6866f49..000000000 --- a/cmake/FindRapidXml.cmake +++ /dev/null @@ -1,6 +0,0 @@ -find_path(RapidXml_INCLUDE_DIR rapidxml_ns/rapidxml_ns.hpp) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(RapidXml DEFAULT_MSG RapidXml_INCLUDE_DIR) - -set(RapidXml_INCLUDE_DIRS ${RapidXml_INCLUDE_DIR}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 093c199b9..570e97897 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.12 FATAL_ERROR) find_package(Boost REQUIRED) find_package(Catch2 REQUIRED) -find_package(RapidXml REQUIRED) +find_package(RAPIDXML REQUIRED) find_package(Svgpp REQUIRED) enable_testing() @@ -25,7 +25,7 @@ set_target_properties(test_common PROPERTIES CXX_STANDARD_REQUIRED ON) target_include_directories(test_common PRIVATE ${Boost_INCLUDE_DIRS} ${GRAPHVIZ_LIB_DIR} - ${RapidXml_INCLUDE_DIRS} + ${RAPIDXML_INCLUDE_DIRS} ${Svgpp_INCLUDE_DIRS} ) target_link_libraries(test_common PUBLIC Catch2::Catch2) -- 2.40.0