diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-23 12:45:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-23 12:46:08 (GMT) |
| commit | 87b9a31489c4251f3fb6a9b79da6156cdb1a1d64 (patch) | |
| tree | 3c7f0f32ec7928bed69138c5fd9fb05533d7e564 /Tests/CMakeLib | |
| parent | 4281f6ac345601ac6f40c5fcb3b43af8361e98ab (diff) | |
| parent | 9629be8080d054ab44603802923a3ce72620f864 (diff) | |
| download | CMake-87b9a31489c4251f3fb6a9b79da6156cdb1a1d64.zip CMake-87b9a31489c4251f3fb6a9b79da6156cdb1a1d64.tar.gz CMake-87b9a31489c4251f3fb6a9b79da6156cdb1a1d64.tar.bz2 | |
Merge topic 'modernize-build-self'
9629be8080 Build: Use `CMAKE_CURRENT_XXX_DIR` instead of top dirs
e6fb5a1feb Build: Sort linked libraries list of `CMakeLib`
aa7290e8dc Build: Use imported target `Threads::Threads` instead of variable
df8ad72ffa Build: Use imported target `kwiml::kwiml` instead of variables
eeebf31e54 Build: Use imported target `LibRHash::LibRHash` instead of variables
08be01a181 Build: Use imported target `LibUV::LibUV` instead of variables
ddac6dcbe8 Build: Use imported target `JsonCpp::JsonCpp` instead of variables
ac76c53d33 Build: Use imported target `CURL::libcurl` instead of variables
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7570
Diffstat (limited to 'Tests/CMakeLib')
| -rw-r--r-- | Tests/CMakeLib/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt index 1d45162..612d4b4 100644 --- a/Tests/CMakeLib/CMakeLists.txt +++ b/Tests/CMakeLib/CMakeLists.txt @@ -47,12 +47,10 @@ if(WIN32) list(APPEND CMakeLib_TESTS testVisualStudioSlnParser.cxx ) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testVisualStudioSlnParser.h.in - ${CMAKE_CURRENT_BINARY_DIR}/testVisualStudioSlnParser.h @ONLY) + configure_file(testVisualStudioSlnParser.h.in testVisualStudioSlnParser.h @ONLY) endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testXMLParser.h.in - ${CMAKE_CURRENT_BINARY_DIR}/testXMLParser.h @ONLY) +configure_file(testXMLParser.h.in testXMLParser.h @ONLY) create_test_sourcelist(CMakeLib_TEST_SRCS CMakeLibTests.cxx ${CMakeLib_TESTS}) add_executable(CMakeLibTests ${CMakeLib_TEST_SRCS}) diff --git a/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt b/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt index 4bef6c5..b4bc921 100644 --- a/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt +++ b/Tests/CMakeLib/PseudoMemcheck/CMakeLists.txt @@ -1,6 +1,6 @@ -foreach (_retval 0 1) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/memtester.cxx.in" "${CMAKE_CURRENT_BINARY_DIR}/ret${_retval}.cxx" @ONLY) -endforeach () +foreach(_retval IN ITEMS 0 1) + configure_file(memtester.cxx.in ret${_retval}.cxx @ONLY) +endforeach() include_directories(${CMake_SOURCE_DIR}/Source ${CMake_BINARY_DIR}/Source) |