mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 09:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

CTest: Remove usages of CMAKE_INTDIR

Browse Source 
The configuration in which CMake/CTest itself is built should not
influence runtime path selection.
This commit is contained in:
Kyle Edwards
2023-02-07 11:04:13 -05:00
parent 448e9ab022
commit c6134ca6c7
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestBuildAndTestHandler.cxx
-10
View File
@@ -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";
}
Source/CTest/cmCTestBuildCommand.cxx
-4
View File
@@ -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");