mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-multi-rsp-remove-path'

Browse Source 
cdb50af2f6 Ninja: Restore shorter path to response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !5094
This commit is contained in:
Brad King
2020-08-06 14:28:11 +00:00
committed by Kitware Robot
parent 9d03b623e7 cdb50af2f6
commit 06427db62c
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -733,12 +733,8 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement(
static_cast<int>(cmSystemTools::CalculateCommandLineLengthLimit()) -
globalGen->GetRuleCmdLength(this->LanguageLinkerDeviceRule(config));
std::string path = localGen.GetHomeRelativeOutputPath();
if (!path.empty()) {
path += '/';
}
build.RspFile = this->ConvertToNinjaPath(
cmStrCat(path, "CMakeFiles/", genTarget->GetName(),
cmStrCat("CMakeFiles/", genTarget->GetName(),
globalGen->IsMultiConfig() ? cmStrCat('.', config) : "", ".rsp"));
// Gather order-only dependencies.
@@ -1160,12 +1156,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
globalGen->GetRuleCmdLength(linkBuild.Rule);
}
std::string path = localGen.GetHomeRelativeOutputPath();
if (!path.empty()) {
path += '/';
}
linkBuild.RspFile = this->ConvertToNinjaPath(
cmStrCat(path, "CMakeFiles/", gt->GetName(),
cmStrCat("CMakeFiles/", gt->GetName(),
globalGen->IsMultiConfig() ? cmStrCat('.', config) : "", ".rsp"));
// Gather order-only dependencies.