diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-08 13:33:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-08 13:33:46 (GMT) |
| commit | 7766e57ff0ec4c9e5a38a3736d9cf5c710fa5a76 (patch) | |
| tree | 464c5d7b1a7d0428ab442fde42b366b287c9f7e7 /Source | |
| parent | 733d3ac0e8709cb7012d6f7efe2273181c707c7e (diff) | |
| parent | 88365838b843ec4452d1f282b5ce23b2b3d6590d (diff) | |
| download | CMake-7766e57ff0ec4c9e5a38a3736d9cf5c710fa5a76.zip CMake-7766e57ff0ec4c9e5a38a3736d9cf5c710fa5a76.tar.gz CMake-7766e57ff0ec4c9e5a38a3736d9cf5c710fa5a76.tar.bz2 | |
Merge topic 'ninja-win-rsp'
88365838b8 Ninja: Use native slashes to pass rsp files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2136
Diffstat (limited to 'Source')
| -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 a4d3e06..7394188 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; |