mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-21 23:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ctest-fix-relative-paths'

Browse Source 
f98732bea8 ctest_configure: Restore handling of relative CTEST_BINARY_DIRECTORY
5a1d5fd9be ctest_start: Restore log file location for relative CTEST_BINARY_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10912
This commit is contained in:
Brad King
2025-07-01 15:03:47 +00:00
committed by Kitware Robot
parent 5a4b4ea877 f98732bea8
commit 363cb28cfe
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CTest/cmCTestConfigureCommand.cxx
+2 -2
View File
@@ -115,11 +115,11 @@ bool cmCTestConfigureCommand::ExecuteConfigure(ConfigureArguments const& args,
}
configureCommand += " \"-S";
configureCommand += sourceDirectory;
configureCommand += cmSystemTools::CollapseFullPath(sourceDirectory);
configureCommand += "\"";
configureCommand += " \"-B";
configureCommand += buildDirectory;
configureCommand += cmSystemTools::CollapseFullPath(buildDirectory);
configureCommand += "\"";
}
Source/CTest/cmCTestStartCommand.cxx
+1 -1
View File
@@ -181,7 +181,7 @@ bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args,
this->CTest->SetCTestConfigurationFromCMakeVariable(
&mf, "BuildName", "CTEST_BUILD_NAME", quiet);
this->CTest->Initialize(bld_dir);
this->CTest->Initialize(binaryDir);
cmCTestOptionalLog(
this->CTest, OUTPUT,