From c6134ca6c72fac7894ddbb9d066b2510ac6dd995 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 Feb 2023 11:04:13 -0500 Subject: CTest: Remove usages of CMAKE_INTDIR The configuration in which CMake/CTest itself is built should not influence runtime path selection. --- Source/CTest/cmCTestBuildAndTestHandler.cxx | 10 ---------- Source/CTest/cmCTestBuildCommand.cxx | 4 ---- 2 files changed, 14 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"); -- cgit v0.12 From db95afce19f507738fb7a4038e79da1cb0b6b0e7 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 Feb 2023 16:38:01 -0500 Subject: Tests/OutDir: Remove stale cache entry on multi-config generators This cache entry is left over from the incorrect behavior prior to the previous commit and was causing the test to fail with the new, correct behavior. Unset the cache variable when a multi-config generator is in use. --- Tests/OutDir/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- cgit v0.12