diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-08 13:32:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-08 13:32:14 (GMT) |
| commit | c984bf668bb46aa335c61d54c3fe62ef3fae20a9 (patch) | |
| tree | ca82929e856f4c4caad76777ae4816082d6cc4c4 | |
| parent | e446d71d31bfb7f089f2576d8e2a5c93d6ee5312 (diff) | |
| parent | 88365838b843ec4452d1f282b5ce23b2b3d6590d (diff) | |
| download | CMake-c984bf668bb46aa335c61d54c3fe62ef3fae20a9.zip CMake-c984bf668bb46aa335c61d54c3fe62ef3fae20a9.tar.gz CMake-c984bf668bb46aa335c61d54c3fe62ef3fae20a9.tar.bz2 | |
Merge branch 'ninja-win-rsp' into release-3.12
Merge-request: !2136
| -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; |