diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2023-02-07 16:04:13 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2023-02-07 16:10:47 (GMT) |
| commit | c6134ca6c72fac7894ddbb9d066b2510ac6dd995 (patch) | |
| tree | 5266048e2a98143cd9052e241a6d340af390d9c9 /Source/CTest | |
| parent | 448e9ab022f1783fa36ecf73398c3364584c7e14 (diff) | |
| download | CMake-c6134ca6c72fac7894ddbb9d066b2510ac6dd995.zip CMake-c6134ca6c72fac7894ddbb9d066b2510ac6dd995.tar.gz CMake-c6134ca6c72fac7894ddbb9d066b2510ac6dd995.tar.bz2 | |
CTest: Remove usages of CMAKE_INTDIR
The configuration in which CMake/CTest itself is built should not
influence runtime path selection.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 10 | ||||
| -rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 4 |
2 files changed, 0 insertions, 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"); |