diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2022-08-26 07:15:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-08-30 21:26:25 (GMT) |
| commit | 36400e9dc1248f34b6cdfc56554dfb9e71a36ea6 (patch) | |
| tree | b16d95efe2704c9b6c76b166ff02626820092a4e /Source/cmNinjaTargetGenerator.cxx | |
| parent | 60a1ccbd6a913d09d7c0a3f2b104e60699718e07 (diff) | |
| download | CMake-36400e9dc1248f34b6cdfc56554dfb9e71a36ea6.zip CMake-36400e9dc1248f34b6cdfc56554dfb9e71a36ea6.tar.gz CMake-36400e9dc1248f34b6cdfc56554dfb9e71a36ea6.tar.bz2 | |
COMPILER_LAUNCHER: Add support for generator expressions
Fixes: #23441
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index a4080d8..e4427f5 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -912,8 +912,10 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang, lang == "OBJCXX")) { std::string const clauncher_prop = cmStrCat(lang, "_COMPILER_LAUNCHER"); cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop); - if (cmNonempty(clauncher)) { - compilerLauncher = *clauncher; + std::string evaluatedClauncher = cmGeneratorExpression::Evaluate( + *clauncher, this->LocalGenerator, config); + if (!evaluatedClauncher.empty()) { + compilerLauncher = evaluatedClauncher; } } |