diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-05 18:32:04 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-02-06 16:07:38 (GMT) |
| commit | 9e219de4fb50096a9386dbe6de9f98cf8a7ec199 (patch) | |
| tree | 0ea9983da347a69958da346acb242b888bc36acd /Tests/CTestConfig | |
| parent | 13ef3285df97fa97a4cc1b7fe81741aeb8adcf7a (diff) | |
| download | CMake-9e219de4fb50096a9386dbe6de9f98cf8a7ec199.zip CMake-9e219de4fb50096a9386dbe6de9f98cf8a7ec199.tar.gz CMake-9e219de4fb50096a9386dbe6de9f98cf8a7ec199.tar.bz2 | |
Ninja Multi-Config: Don't include MinSizeRel by default
Diffstat (limited to 'Tests/CTestConfig')
| -rw-r--r-- | Tests/CTestConfig/dashboard.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/CTestConfig/script.cmake.in | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Tests/CTestConfig/dashboard.cmake.in b/Tests/CTestConfig/dashboard.cmake.in index 4bb1262..34824e3 100644 --- a/Tests/CTestConfig/dashboard.cmake.in +++ b/Tests/CTestConfig/dashboard.cmake.in @@ -13,6 +13,8 @@ message("CMAKE_CTEST_COMMAND='${CMAKE_CTEST_COMMAND}'") set(arg "") if(NOT _isMultiConfig) set(arg "-DCMAKE_BUILD_TYPE:STRING=@cfg@") +else() + set(arg "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release\\;MinSizeRel\\;RelWithDebInfo") endif() message("cmake initial configure") diff --git a/Tests/CTestConfig/script.cmake.in b/Tests/CTestConfig/script.cmake.in index 973c7b8..59c585b 100644 --- a/Tests/CTestConfig/script.cmake.in +++ b/Tests/CTestConfig/script.cmake.in @@ -6,7 +6,14 @@ set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestConfig/@cfg@-script") ctest_start(Experimental) -ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE rv) +set(_isMultiConfig "@_isMultiConfig@") +if(_isMultiConfig) + set(cfg_opts "-DCMAKE_CONFIGURATION_TYPES=Debug\\;Release\\;MinSizeRel\\;RelWithDebInfo") +else() + set(cfg_opts) +endif() + +ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS "${cfg_opts}" RETURN_VALUE rv) if(NOT rv STREQUAL 0) message(FATAL_ERROR "*** error in ctest_configure ***") endif() |