kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefiles: Simplify MakeLauncher return value

Browse Source 
Bonus NRVO.
This commit is contained in:
Stephen Kelly 2016-08-27 13:44:54 +02:00
parent e804d410cd
commit ba4ba7c39d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1031,6 +1031,7 @@ std::string cmLocalUnixMakefileGenerator3::MakeLauncher(
cmCustomCommandGenerator const& ccg, cmGeneratorTarget* target, cmCustomCommandGenerator const& ccg, cmGeneratorTarget* target,
cmOutputConverter::RelativeRoot relative) cmOutputConverter::RelativeRoot relative)
{ {
std::string launcher;
// Short-circuit if there is no launcher. // Short-circuit if there is no launcher.
const char* prop = "RULE_LAUNCH_CUSTOM"; const char* prop = "RULE_LAUNCH_CUSTOM";
const char* val = this->GetRuleLauncher(target, prop); const char* val = this->GetRuleLauncher(target, prop);
@ -1047,14 +1048,12 @@ std::string cmLocalUnixMakefileGenerator3::MakeLauncher(
} }
vars.Output = output.c_str(); vars.Output = output.c_str();
std::string launcher;
this->ExpandRuleVariables(launcher, vars); this->ExpandRuleVariables(launcher, vars);
if (!launcher.empty()) { if (!launcher.empty()) {
launcher += " "; launcher += " ";
} }
return launcher;
} }
return ""; return launcher;
} }
void cmLocalUnixMakefileGenerator3::AppendCleanCommand( void cmLocalUnixMakefileGenerator3::AppendCleanCommand(