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

Ninja: Use native slashes to pass rsp files

Browse Source 
Some tools on Windows (e.g. Embarcadero linkers) can't handle forward
slashes in paths to rsp files.
This commit is contained in:
Matthijs Kool
2018-06-05 15:21:49 +02:00
committed by Brad King
parent 90ebc32d9e
commit 88365838b8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmNinjaNormalTargetGenerator.cxx
View File

@@ -719,9 +719,9 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement()
static_cast<int>(cmSystemTools::CalculateCommandLineLengthLimit()) - static_cast<int>(cmSystemTools::CalculateCommandLineLengthLimit()) -
globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule()); globalGen.GetRuleCmdLength(this->LanguageLinkerDeviceRule());
const std::string rspfile = const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + std::string(cmake::GetCMakeFilesDirectoryPostSlash()) +
genTarget.GetName() + ".rsp"; genTarget.GetName() + ".rsp");
// Gather order-only dependencies. // Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps; cmNinjaDeps orderOnlyDeps;
@@ -1005,9 +1005,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
globalGen.GetRuleCmdLength(this->LanguageLinkerRule()); globalGen.GetRuleCmdLength(this->LanguageLinkerRule());
} }
const std::string rspfile = const std::string rspfile = this->ConvertToNinjaPath(
std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() + std::string(cmake::GetCMakeFilesDirectoryPostSlash()) + gt.GetName() +
".rsp"; ".rsp");
// Gather order-only dependencies. // Gather order-only dependencies.
cmNinjaDeps orderOnlyDeps; cmNinjaDeps orderOnlyDeps;