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

cmOutputConverter: remove unnecessary conversion

This commit is contained in:
Daniel Pfeifer 2016-06-20 23:18:59 +02:00
parent bdaadbdc2b
commit 8ddbd4c280
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmOutputConverter.cxx
View File

@ -30,13 +30,11 @@ cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot)
std::string cmOutputConverter::ConvertToOutputForExisting( std::string cmOutputConverter::ConvertToOutputForExisting(
const std::string& remote, OutputFormat format) const const std::string& remote, OutputFormat format) const
{ {
// Perform standard conversion.
std::string result = this->ConvertToOutputFormat(remote, format);
// If this is a windows shell, the result has a space, and the path // If this is a windows shell, the result has a space, and the path
// already exists, we can use a short-path to reference it without a // already exists, we can use a short-path to reference it without a
// space. // space.
if (this->GetState()->UseWindowsShell() && result.find(' ') != result.npos && if (this->GetState()->UseWindowsShell() &&
remote.find(' ') != std::string::npos &&
cmSystemTools::FileExists(remote.c_str())) { cmSystemTools::FileExists(remote.c_str())) {
std::string tmp; std::string tmp;
if (cmSystemTools::GetShortPath(remote, tmp)) { if (cmSystemTools::GetShortPath(remote, tmp)) {
@ -44,8 +42,8 @@ std::string cmOutputConverter::ConvertToOutputForExisting(
} }
} }
// Otherwise, leave it unchanged. // Otherwise, perform standard conversion.
return result; return this->ConvertToOutputFormat(remote, format);
} }
std::string cmOutputConverter::ConvertToOutputForExisting( std::string cmOutputConverter::ConvertToOutputForExisting(