dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ninja-multi-rsp' into release-3.17

Browse Source 
Merge-request: !5020
This commit is contained in:
Brad King
2020-07-16 12:02:54 -04:00
parent 5a745cfbe0 99ed39b011
commit ffe425f768
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmNinjaNormalTargetGenerator.cxx
View File

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