kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert: Extract ConvertToRelativePath from Convert() 

Convert() does some kind of relative conversion, followed by a
conversion to 'output format'.

Make it possible to do the former without the latter.
This commit is contained in:
Stephen Kelly 2016-08-27 13:44:56 +02:00
parent 95a659f180
commit 564d3a1dc8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmOutputConverter.cxx
View File

@ -46,11 +46,9 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
return this->ConvertToOutputFormat(remote, format);
}
std::string cmOutputConverter::Convert(const std::string& source,
RelativeRoot relative,
OutputFormat output) const
std::string cmOutputConverter::ConvertToRelativePath(
const std::string& source, RelativeRoot relative) const
{
// Convert the path to a relative path.
std::string result = source;
switch (relative) {
@ -76,6 +74,15 @@ std::string cmOutputConverter::Convert(const std::string& source,
result = cmSystemTools::CollapseFullPath(result);
break;
}
return result;
}
std::string cmOutputConverter::Convert(const std::string& source,
RelativeRoot relative,
OutputFormat output) const
{
// Convert the path to a relative path.
std::string result = this->ConvertToRelativePath(source, relative);
return this->ConvertToOutputFormat(result, output);
}

2
Source/cmOutputConverter.h
View File

@ -56,6 +56,8 @@ public:
OutputFormat output) const;
std::string Convert(const std::string& remote, RelativeRoot local,
OutputFormat output = UNCHANGED) const;
std::string ConvertToRelativePath(const std::string& remote,
RelativeRoot local) const;
std::string ConvertDirectorySeparatorsForShell(
const std::string& source) const;