From d92c160db333bf65e52da1cb73a068b5d3f1db4f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 4 Oct 2016 22:56:31 +0200 Subject: Ninja: Separate two coupled calls --- Source/cmLocalNinjaGenerator.cxx | 7 +++---- 1 file 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& 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); -- cgit v0.12 From d9fde87d1a3a4de382d664bd121af957af6eaaea Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 4 Oct 2016 22:56:31 +0200 Subject: Ninja: Replace array access with local variable --- Source/cmLocalNinjaGenerator.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index eb48653..22fae4c 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -488,13 +488,13 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher( std::string output; const std::vector& outputs = ccg.GetOutputs(); if (!outputs.empty()) { + output = outputs[0]; if (ccg.GetWorkingDirectory().empty()) { - output = this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), - outputs[0]); + output = + this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), output); output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } else { - output = - this->ConvertToOutputFormat(outputs[0], cmOutputConverter::SHELL); + output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } } vars.Output = output.c_str(); -- cgit v0.12 From cc5e6b82c2ae8293a400b604e0366578f9097d94 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 4 Oct 2016 22:56:32 +0200 Subject: Ninja: Extract identical code from condition --- Source/cmLocalNinjaGenerator.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 22fae4c..b04c11d 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -492,10 +492,8 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher( if (ccg.GetWorkingDirectory().empty()) { output = this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), output); - output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); - } else { - output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } + output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); } vars.Output = output.c_str(); -- cgit v0.12