diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-12 13:39:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-12 13:39:46 (GMT) |
| commit | 42212f7539040139ecec092547b7d58ef12a4d72 (patch) | |
| tree | 0b23679e0357da1d4921797081d546119cbe5920 | |
| parent | 708b3fecfe4ea4f92f49bb5eea5c9eed370a5956 (diff) | |
| parent | 3e125c0c017e346768f9882882c31b81cc07940f (diff) | |
| download | CMake-42212f7539040139ecec092547b7d58ef12a4d72.zip CMake-42212f7539040139ecec092547b7d58ef12a4d72.tar.gz CMake-42212f7539040139ecec092547b7d58ef12a4d72.tar.bz2 | |
Merge topic 'rule-launch-custom-extra-space'
3e125c0c01 Ninja,Makefile: Drop extra space after RULE_LAUNCH_CUSTOM value
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2372
| -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 += " "; |