diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-04 13:07:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-04 13:07:16 (GMT) |
| commit | 0f51d44aea0e469543b4c19fd1a04f8c3b817b63 (patch) | |
| tree | 840bf755009b50a2872edd57e0902c4d3505c91e | |
| parent | c792926b35d85fa504611fc921746db633f655b2 (diff) | |
| parent | c2c22862287971035157fb732faf925df7832dbb (diff) | |
| download | CMake-0f51d44aea0e469543b4c19fd1a04f8c3b817b63.zip CMake-0f51d44aea0e469543b4c19fd1a04f8c3b817b63.tar.gz CMake-0f51d44aea0e469543b4c19fd1a04f8c3b817b63.tar.bz2 | |
Merge topic 'test-CMake.GetPrerequisites-config-message'
c2c22862 Tests: Fix CMake.GetPrerequisites test config message
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !654
| -rw-r--r-- | Tests/CMakeTests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/CMakeTests/GetPrerequisitesTest.cmake.in | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt index d5524c3..1cca35d 100644 --- a/Tests/CMakeTests/CMakeLists.txt +++ b/Tests/CMakeTests/CMakeLists.txt @@ -53,10 +53,7 @@ set(EndStuff_PreArgs ) AddCMakeTest(EndStuff "${EndStuff_PreArgs}") -set(GetPrerequisites_PreArgs - "-DCTEST_CONFIGURATION_TYPE:STRING=\\\${CTEST_CONFIGURATION_TYPE}" - ) -AddCMakeTest(GetPrerequisites "${GetPrerequisites_PreArgs}") +AddCMakeTest(GetPrerequisites "-DConfiguration:STRING=$<CONFIGURATION>") if(GIT_EXECUTABLE) set(PolicyCheck_PreArgs diff --git a/Tests/CMakeTests/GetPrerequisitesTest.cmake.in b/Tests/CMakeTests/GetPrerequisitesTest.cmake.in index 89ca735..7325b87 100644 --- a/Tests/CMakeTests/GetPrerequisitesTest.cmake.in +++ b/Tests/CMakeTests/GetPrerequisitesTest.cmake.in @@ -2,18 +2,15 @@ # include(GetPrerequisites) -set(CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@") -set(CMAKE_CONFIGURATION_TYPES "@CMAKE_CONFIGURATION_TYPES@") set(CMAKE_EXECUTABLE_SUFFIX "@CMAKE_EXECUTABLE_SUFFIX@") message(STATUS "=============================================================================") message(STATUS "CTEST_FULL_OUTPUT (Avoid ctest truncation of output)") message(STATUS "") -message(STATUS "CMAKE_BUILD_TYPE='${CMAKE_BUILD_TYPE}'") -message(STATUS "CMAKE_CONFIGURATION_TYPES='${CMAKE_CONFIGURATION_TYPES}'") +message(STATUS "Configuration '${Configuration}'") +message(STATUS "CMAKE_COMMAND='${CMAKE_COMMAND}'") message(STATUS "CMAKE_EXECUTABLE_SUFFIX='${CMAKE_EXECUTABLE_SUFFIX}'") -message(STATUS "CTEST_CONFIGURATION_TYPE='${CTEST_CONFIGURATION_TYPE}'") message(STATUS "") |