diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-06 14:28:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-06 14:28:27 (GMT) |
| commit | ce4216dedd8d4ceb2c68ab6f0f7fe44a0a10421d (patch) | |
| tree | 5aac39806f32b0f633d573352aab34e454a20a72 /Source | |
| parent | 63a65baf4c343c73b2142078ef0045d3711dea1d (diff) | |
| parent | cdb50af2f6801bf760376c9d78d39131be93b987 (diff) | |
| download | CMake-ce4216dedd8d4ceb2c68ab6f0f7fe44a0a10421d.zip CMake-ce4216dedd8d4ceb2c68ab6f0f7fe44a0a10421d.tar.gz CMake-ce4216dedd8d4ceb2c68ab6f0f7fe44a0a10421d.tar.bz2 | |
Merge topic 'ninja-multi-rsp-remove-path' into release-3.18
cdb50af2f6 Ninja: Restore shorter path to response files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !5094
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 0f01f85..32ab9f8 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -733,12 +733,8 @@ void cmNinjaNormalTargetGenerator::WriteDeviceLinkStatement( static_cast<int>(cmSystemTools::CalculateCommandLineLengthLimit()) - globalGen->GetRuleCmdLength(this->LanguageLinkerDeviceRule(config)); - std::string path = localGen.GetHomeRelativeOutputPath(); - if (!path.empty()) { - path += '/'; - } build.RspFile = this->ConvertToNinjaPath( - cmStrCat(path, "CMakeFiles/", genTarget->GetName(), + cmStrCat("CMakeFiles/", genTarget->GetName(), globalGen->IsMultiConfig() ? cmStrCat('.', config) : "", ".rsp")); // Gather order-only dependencies. @@ -1159,12 +1155,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement( globalGen->GetRuleCmdLength(linkBuild.Rule); } - std::string path = localGen.GetHomeRelativeOutputPath(); - if (!path.empty()) { - path += '/'; - } linkBuild.RspFile = this->ConvertToNinjaPath( - cmStrCat(path, "CMakeFiles/", gt->GetName(), + cmStrCat("CMakeFiles/", gt->GetName(), globalGen->IsMultiConfig() ? cmStrCat('.', config) : "", ".rsp")); // Gather order-only dependencies. |