diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-08 16:46:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-08 16:46:39 (GMT) |
| commit | 507dcaf5639c8a3e0ae4aeb2792b6926861aebd3 (patch) | |
| tree | bca755240dd521f4f0d922290af2bde17e5977b6 | |
| parent | 61f271f6ed7b5a68d24df28f5d2e3e743240e6d9 (diff) | |
| parent | db95afce19f507738fb7a4038e79da1cb0b6b0e7 (diff) | |
| download | CMake-507dcaf5639c8a3e0ae4aeb2792b6926861aebd3.zip CMake-507dcaf5639c8a3e0ae4aeb2792b6926861aebd3.tar.gz CMake-507dcaf5639c8a3e0ae4aeb2792b6926861aebd3.tar.bz2 | |
Merge topic 'ctest-remove-cmake-intdir'
db95afce19 Tests/OutDir: Remove stale cache entry on multi-config generators
c6134ca6c7 CTest: Remove usages of CMAKE_INTDIR
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8176
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 10 | ||||
| -rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 4 | ||||
| -rw-r--r-- | Tests/OutDir/CMakeLists.txt | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 643bc6f..cece98e 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -72,11 +72,6 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, if (!this->CTest->GetConfigType().empty()) { config = this->CTest->GetConfigType().c_str(); } -#ifdef CMAKE_INTDIR - if (!config) { - config = CMAKE_INTDIR; - } -#endif if (config) { args.push_back("-DCMAKE_BUILD_TYPE:STRING=" + std::string(config)); @@ -256,11 +251,6 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring) if (!this->CTest->GetConfigType().empty()) { config = this->CTest->GetConfigType().c_str(); } -#ifdef CMAKE_INTDIR - if (!config) { - config = CMAKE_INTDIR; - } -#endif if (!config) { config = "Debug"; } diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 71787ea..50d69df 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -89,11 +89,7 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler() } } if (cmakeBuildConfiguration.empty()) { -#ifdef CMAKE_INTDIR - cmakeBuildConfiguration = CMAKE_INTDIR; -#else cmakeBuildConfiguration = "Debug"; -#endif } std::string dir = this->CTest->GetCTestConfiguration("BuildDirectory"); diff --git a/Tests/OutDir/CMakeLists.txt b/Tests/OutDir/CMakeLists.txt index 8afe036..e7bc3ab 100644 --- a/Tests/OutDir/CMakeLists.txt +++ b/Tests/OutDir/CMakeLists.txt @@ -7,7 +7,7 @@ if(_isMultiConfig) string(TOUPPER "${config}" CONFIG) list(APPEND configs "${CONFIG}") endforeach() - set(CMAKE_BUILD_TYPE) + unset(CMAKE_BUILD_TYPE CACHE) elseif(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif() |