diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-11 18:04:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-11 18:18:10 (GMT) |
| commit | 3e125c0c017e346768f9882882c31b81cc07940f (patch) | |
| tree | 2fe8beb8807089ec49d968823c7e9d3b503cf1fe | |
| parent | 344eb9c8dc3b16a524729cb66ad25fc1c127a02c (diff) | |
| download | CMake-3e125c0c017e346768f9882882c31b81cc07940f.zip CMake-3e125c0c017e346768f9882882c31b81cc07940f.tar.gz CMake-3e125c0c017e346768f9882882c31b81cc07940f.tar.bz2 | |
Ninja,Makefile: Drop extra space after RULE_LAUNCH_CUSTOM value
The Ninja and Makefile generators were adding a space to the value both
before and after expanding rule variables. Only the latter is needed.
While at it, revise some outdated comments since the rule variable
expansion is no longer responsible for inserting the launcher.
Suggested-by: Mate Pek <mate.pek@gmail.com>
Fixes: #18340
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 360f73d..eb31478 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -564,8 +564,7 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher( return std::string(); } - // Expand rules in the empty string. It may insert the launcher and - // perform replacements. + // Expand rule variables referenced in the given launcher command. cmRulePlaceholderExpander::RuleVariables vars; std::string output; @@ -580,12 +579,10 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher( } vars.Output = output.c_str(); - std::string launcher = property_value; - launcher += " "; - std::unique_ptr<cmRulePlaceholderExpander> rulePlaceholderExpander( this->CreateRulePlaceholderExpander()); + std::string launcher = property_value; rulePlaceholderExpander->ExpandRuleVariables(this, launcher, vars); if (!launcher.empty()) { launcher += " "; diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index bc83ce2..690b827 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -967,8 +967,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand( // Short-circuit if there is no launcher. const char* val = this->GetRuleLauncher(target, "RULE_LAUNCH_CUSTOM"); if (val && *val) { - // Expand rules in the empty string. It may insert the launcher and - // perform replacements. + // Expand rule variables referenced in the given launcher command. cmRulePlaceholderExpander::RuleVariables vars; vars.CMTargetName = target->GetName().c_str(); vars.CMTargetType = cmState::GetTargetTypeName(target->GetType()); @@ -986,7 +985,6 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand( vars.Output = output.c_str(); launcher = val; - launcher += " "; rulePlaceholderExpander->ExpandRuleVariables(this, launcher, vars); if (!launcher.empty()) { launcher += " "; |