summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalNinjaGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-04 20:56:32 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-08 09:36:02 (GMT)
commitcc5e6b82c2ae8293a400b604e0366578f9097d94 (patch)
tree35ef64aee1592cec478ba71c0f7ddd907e0c7bc6 /Source/cmLocalNinjaGenerator.cxx
parentd9fde87d1a3a4de382d664bd121af957af6eaaea (diff)
downloadCMake-cc5e6b82c2ae8293a400b604e0366578f9097d94.zip
CMake-cc5e6b82c2ae8293a400b604e0366578f9097d94.tar.gz
CMake-cc5e6b82c2ae8293a400b604e0366578f9097d94.tar.bz2
Ninja: Extract identical code from condition
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
-rw-r--r--Source/cmLocalNinjaGenerator.cxx4
1 files changed, 1 insertions, 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();