Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 19:08:07 +08:00
Code Issues Projects Releases Wiki Activity

cmMakefileTargetGenerator: Clarify name of relative path conversion helper

Browse Source
This commit is contained in:
Brad King
2021-05-12 14:38:21 -04:00
parent ec1ea13066
commit 1d1d88d3c8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefileTargetGenerator.cxx
View File

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