mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 11:50:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-cleanups'

Browse Source 
cc5e6b82 Ninja: Extract identical code from condition
d9fde87d Ninja: Replace array access with local variable
d92c160d Ninja: Separate two coupled calls
This commit is contained in:
Brad King
2016-10-10 10:23:42 -04:00
committed by CMake Topic Stage
parent 8fe948c54c cc5e6b82c2
commit ea533eb715
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalNinjaGenerator.cxx
+3 -6
View File
@@ -488,15 +488,12 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher(
std::string output;
const std::vector<std::string>& outputs = ccg.GetOutputs();
if (!outputs.empty()) {
output = outputs[0];
if (ccg.GetWorkingDirectory().empty()) {
output = this->ConvertToOutputFormat(
this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(),
outputs[0]),
cmOutputConverter::SHELL);
} else {
output =
this->ConvertToOutputFormat(outputs[0], cmOutputConverter::SHELL);
this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(), output);
}
output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL);
}
vars.Output = output.c_str();