mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 14:23:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ninja-win-rsp' into release-3.12

Browse Source 
Merge-request: !2136
This commit is contained in:
Brad King
2018-06-08 09:32:14 -04:00
parent e446d71d31 88365838b8
commit c984bf668b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmNinjaNormalTargetGenerator.cxx
+4 -4
View File
@@ -719,9 +719,9 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
static_cast<int>(cmSystemTools::CalculateCommandLineLengthLimit()) -
globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule());
const std::string rspfile =
const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) +
genTarget.GetName() + ".rsp";
genTarget.GetName() + ".rsp");
// Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps;
@@ -1005,9 +1005,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
globalGen.GetRuleCmdLength(this->LanguageLinkerRule());
}
const std::string rspfile =
const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() +
".rsp";
".rsp");
// Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps;