diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-04 20:56:31 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-07 19:37:38 (GMT) |
| commit | d92c160db333bf65e52da1cb73a068b5d3f1db4f (patch) | |
| tree | d98ae84df268bbfab1ec955de8f48535fab912e6 /Source/cmLocalNinjaGenerator.cxx | |
| parent | 7a1e542ed7065ab300af11f5cb4cfe465de2e5e6 (diff) | |
| download | CMake-d92c160db333bf65e52da1cb73a068b5d3f1db4f.zip CMake-d92c160db333bf65e52da1cb73a068b5d3f1db4f.tar.gz CMake-d92c160db333bf65e52da1cb73a068b5d3f1db4f.tar.bz2 | |
Ninja: Separate two coupled calls
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 5736581..eb48653 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -489,10 +489,9 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher( const std::vector<std::string>& outputs = ccg.GetOutputs(); if (!outputs.empty()) { if (ccg.GetWorkingDirectory().empty()) { - output = this->ConvertToOutputFormat( - this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), - outputs[0]), - cmOutputConverter::SHELL); + output = this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), + outputs[0]); + output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } else { output = this->ConvertToOutputFormat(outputs[0], cmOutputConverter::SHELL); |