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

Makefiles: Invert logic in MakeLauncher 

Make it easier to inline into the caller.
This commit is contained in:
Stephen Kelly 2016-08-27 13:44:54 +02:00
parent 2722c4dcc5
commit e804d410cd
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1034,10 +1034,7 @@ std::string cmLocalUnixMakefileGenerator3::MakeLauncher(
// 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);
if (!(val && *val)) { if (val && *val) {
return "";
}
// Expand rules in the empty string. It may insert the launcher and // Expand rules in the empty string. It may insert the launcher and
// perform replacements. // perform replacements.
RuleVariables vars; RuleVariables vars;
@ -1056,6 +1053,8 @@ std::string cmLocalUnixMakefileGenerator3::MakeLauncher(
launcher += " "; launcher += " ";
} }
return launcher; return launcher;
}
return "";
} }
void cmLocalUnixMakefileGenerator3::AppendCleanCommand( void cmLocalUnixMakefileGenerator3::AppendCleanCommand(