Commit cde127b0 authored by Daniel Pfeifer's avatar Daniel Pfeifer
Browse files

cmOutputConverter::Convert: invert condition

Make the control flow of the 'optional' argument more explicit.
parent c23f89bc
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment