diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2023-02-02 21:40:48 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2023-02-03 16:23:32 (GMT) |
| commit | 78cf427157d15ca39c0e3133e9d05eda532578d0 (patch) | |
| tree | 0d1cedaea42f856477949cd175dd0ad4d434bc84 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | cabad8a37f9370df96dfebc124e38d82c141c76a (diff) | |
| download | CMake-78cf427157d15ca39c0e3133e9d05eda532578d0.zip CMake-78cf427157d15ca39c0e3133e9d05eda532578d0.tar.gz CMake-78cf427157d15ca39c0e3133e9d05eda532578d0.tar.bz2 | |
RULE_LAUNCH_*: Add support for generator expressions
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 7172d34..56a41b1 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1003,7 +1003,9 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand( std::string launcher; // Short-circuit if there is no launcher. - cmValue val = this->GetRuleLauncher(target, "RULE_LAUNCH_CUSTOM"); + std::string val = this->GetRuleLauncher( + target, "RULE_LAUNCH_CUSTOM", + this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE")); if (cmNonempty(val)) { // Expand rule variables referenced in the given launcher command. cmRulePlaceholderExpander::RuleVariables vars; @@ -1022,7 +1024,7 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand( } vars.Output = output.c_str(); - launcher = *val; + launcher = val; rulePlaceholderExpander->ExpandRuleVariables(this, launcher, vars); if (!launcher.empty()) { launcher += " "; |