From 1d1d88d3c8b6745b31c220599f536fd50bf5cbe9 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 12 May 2021 14:38:21 -0400
Subject: cmMakefileTargetGenerator: Clarify name of relative path conversion
 helper

---
 Source/cmMakefileTargetGenerator.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index e07e722..bec7805 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1775,7 +1775,7 @@ public:
   {
     // Construct the name of the next object.
     this->NextObject = this->OutputConverter->ConvertToOutputFormat(
-      this->MaybeConvertToRelativePath(obj), cmOutputConverter::RESPONSE);
+      this->MaybeRelativeToCurBinDir(obj), cmOutputConverter::RESPONSE);
 
     // Roll over to next string if the limit will be exceeded.
     if (this->LengthLimit != std::string::npos &&
@@ -1796,13 +1796,13 @@ public:
   void Done() { this->Strings.push_back(this->CurrentString); }
 
 private:
-  std::string MaybeConvertToRelativePath(std::string const& obj)
+  std::string MaybeRelativeToCurBinDir(std::string const& path)
   {
-    if (!this->StateDir.ContainsBoth(this->StateDir.GetCurrentBinary(), obj)) {
-      return obj;
+    std::string const& base = this->StateDir.GetCurrentBinary();
+    if (!this->StateDir.ContainsBoth(base, path)) {
+      return path;
     }
-    return cmSystemTools::ForceToRelativePath(
-      this->StateDir.GetCurrentBinary(), obj);
+    return cmSystemTools::ForceToRelativePath(base, path);
   }
 
   std::vector<std::string>& Strings;
-- 
cgit v0.12