diff options
| author | Matthijs Kool <m.kool@stylecncmachines.com> | 2018-06-05 15:21:49 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-08 09:31:23 -0400 |
| commit | 88365838b843ec4452d1f282b5ce23b2b3d6590d (patch) | |
| tree | 76c9684c0262bdd38b3175e9111a3e2217e40749 | |
| parent | 90ebc32d9e7400a590973b30c99f2986bcb2b755 (diff) | |
| download | cmake-88365838b843ec4452d1f282b5ce23b2b3d6590d.tar.gz | |
Ninja: Use native slashes to pass rsp files
Some tools on Windows (e.g. Embarcadero linkers) can't handle forward
slashes in paths to rsp files.
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index a4d3e06327..7394188664 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -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; |