diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-03 16:25:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-08-03 16:25:10 (GMT) |
| commit | 507fecd7e29c32d0b410f7d648bc60b6b5140410 (patch) | |
| tree | ccf2126cb0015002b3aa8cc7907f914854738a32 | |
| parent | 103d6faed9f170b44d8ddf9ea55588a68a165469 (diff) | |
| parent | cdb50af2f6801bf760376c9d78d39131be93b987 (diff) | |
| download | CMake-507fecd7e29c32d0b410f7d648bc60b6b5140410.zip CMake-507fecd7e29c32d0b410f7d648bc60b6b5140410.tar.gz CMake-507fecd7e29c32d0b410f7d648bc60b6b5140410.tar.bz2 | |
Merge branch 'ninja-multi-rsp-remove-path' into release-3.17
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 eed463d..ba2ea5b 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -748,12 +748,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. @@ -1162,12 +1158,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. |