mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 13:22:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ninja: Separate two coupled calls

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-04 22:56:31 +02:00
parent 7a1e542ed7
commit d92c160db3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalNinjaGenerator.cxx
View File

@@ -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);