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

cmOutputConverter::Convert: invert condition 

Make the control flow of the 'optional' argument more explicit.
This commit is contained in:
Daniel Pfeifer 2016-06-20 22:12:21 +02:00
parent c23f89bc76
commit cde127b084
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmOutputConverter.cxx
View File

@ -168,14 +168,14 @@ std::string cmOutputConverter::Convert(RelativeRoot remote,
const char* remotePath = this->GetRelativeRootPath(remote);
assert(remotePath != 0);
if (!local.empty() && !optional) {
std::vector<std::string> components;
cmSystemTools::SplitPath(local, components);
std::string result = this->ConvertToRelativePath(components, remotePath);
return this->ConvertToOutputFormat(result, output);
if (local.empty() || optional) {
return this->ConvertToOutputFormat(remotePath, output);
}
return this->ConvertToOutputFormat(remotePath, output);
std::vector<std::string> components;
cmSystemTools::SplitPath(local, components);
std::string result = this->ConvertToRelativePath(components, remotePath);
return this->ConvertToOutputFormat(result, output);
}
static bool cmOutputConverterNotAbove(const char* a, const char* b)