commit 507fecd7e29c32d0b410f7d648bc60b6b5140410
author Brad King <brad.king@kitware.com> Mon Aug 03 12:25:10 2020 -0400
committer Brad King <brad.king@kitware.com> Mon Aug 03 12:25:10 2020 -0400
tree ccf2126cb0015002b3aa8cc7907f914854738a32
parent 103d6faed9f170b44d8ddf9ea55588a68a165469
parent cdb50af2f6801bf760376c9d78d39131be93b987

Merge branch 'ninja-multi-rsp-remove-path' into release-3.17

Merge-request: !5094

Source/cmNinjaNormalTargetGenerator.cxx

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 @@
     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 @@
       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.