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 | 06427db62cb9bcd79bb174ba7185f9bbe10e9937 (patch) | |
| tree | e45f7627646e27aac2a69b3f558ea89277e81189 | |
| parent | 9d03b623e7049a4a197531cadb1ebae3de1d1e64 (diff) | |
| parent | cdb50af2f6801bf760376c9d78d39131be93b987 (diff) | |
| download | CMake-06427db62cb9bcd79bb174ba7185f9bbe10e9937.zip CMake-06427db62cb9bcd79bb174ba7185f9bbe10e9937.tar.gz CMake-06427db62cb9bcd79bb174ba7185f9bbe10e9937.tar.bz2 | |
Merge topic 'ninja-multi-rsp-remove-path'
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
| -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 1775085..bde5ee7 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. @@ -1160,12 +1156,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. |