mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-05 22:28:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

generators: use GetObjectOutputRoot to compute target directories

Browse Source 
In a coming change to shorten directory paths, this allows one place to
decide how to compute the target path root.
This commit is contained in:
Ben Boeckel
2025-05-21 21:44:34 +02:00
parent b1d9a5313c
commit bc19e42461
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmExtraEclipseCDT4Generator.cxx
View File

@@ -972,8 +972,8 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
xml, "Build", make, buildArgs, virtDir, "", targetName.c_str()); xml, "Build", make, buildArgs, virtDir, "", targetName.c_str());
std::string cleanArgs = std::string cleanArgs =
cmStrCat("-E chdir \"", lgen->GetCurrentBinaryDirectory(), cmStrCat("-E chdir \"", lgen->GetObjectOutputRoot(), "\" \"",
"\" \"", cmSystemTools::GetCMakeCommand(), "\" -P \""); cmSystemTools::GetCMakeCommand(), "\" -P \"");
cleanArgs += lgen->GetTargetDirectory(target.get()); cleanArgs += lgen->GetTargetDirectory(target.get());
cleanArgs += "/cmake_clean.cmake\""; cleanArgs += "/cmake_clean.cmake\"";
cmExtraEclipseCDT4Generator::AppendTarget( cmExtraEclipseCDT4Generator::AppendTarget(

2
Source/cmGeneratorTarget.cxx
View File

@@ -5218,7 +5218,7 @@ bool cmGeneratorTarget::NeedImportLibraryName(std::string const& config) const
std::string cmGeneratorTarget::GetSupportDirectory() const std::string cmGeneratorTarget::GetSupportDirectory() const
{ {
cmLocalGenerator* lg = this->GetLocalGenerator(); cmLocalGenerator* lg = this->GetLocalGenerator();
return cmStrCat(lg->GetCurrentBinaryDirectory(), '/', return cmStrCat(lg->GetObjectOutputRoot(), '/',
lg->GetTargetDirectory(this)); lg->GetTargetDirectory(this));
} }

2
Source/cmLocalNinjaGenerator.cxx
View File

@@ -75,7 +75,7 @@ void cmLocalNinjaGenerator::Generate()
// Compute the path to use when referencing the current output // Compute the path to use when referencing the current output
// directory from the top output directory. // directory from the top output directory.
this->HomeRelativeOutputPath = this->HomeRelativeOutputPath =
this->MaybeRelativeToTopBinDir(this->GetCurrentBinaryDirectory()); this->MaybeRelativeToTopBinDir(this->GetObjectOutputRoot());
if (this->HomeRelativeOutputPath == ".") { if (this->HomeRelativeOutputPath == ".") {
this->HomeRelativeOutputPath.clear(); this->HomeRelativeOutputPath.clear();
} }