Ninja: Separate two coupled calls

This commit is contained in:
Stephen Kelly committed 2016-10-07 21:37:38 +02:00
1 parent 7a1e542ed7
commit d92c160db3
1 file changed
+3 -4
+3 -4
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);