diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-03 15:00:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-03 15:00:49 (GMT) |
| commit | c3210aab46001b057bc37653f2c65d623e134d7d (patch) | |
| tree | 3d64c9de813622d145348c1ddbf55f89ae408f9b /Source/cmMakefileTargetGenerator.cxx | |
| parent | 82f61a20b4becbe3468e6280d71bb9b01cffd2e6 (diff) | |
| parent | 33e27f6ca6b2ba1c92b5d428daf8eee769424853 (diff) | |
| download | CMake-c3210aab46001b057bc37653f2c65d623e134d7d.zip CMake-c3210aab46001b057bc37653f2c65d623e134d7d.tar.gz CMake-c3210aab46001b057bc37653f2c65d623e134d7d.tar.bz2 | |
Merge topic 'lang-linker-launcher-genex'
33e27f6ca6 <LANG>_LINKER_LAUNCHER: Allow generator expressions
84ada0b0c9 <LANG>_COMPILER_LAUNCHER: Expand subset of genexes that can be evaluated
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8152
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index c40d685..6612595 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1044,7 +1044,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles( std::string const clauncher_prop = lang + "_COMPILER_LAUNCHER"; cmValue clauncher = this->GeneratorTarget->GetProperty(clauncher_prop); std::string evaluatedClauncher = cmGeneratorExpression::Evaluate( - *clauncher, this->LocalGenerator, config); + *clauncher, this->LocalGenerator, config, this->GeneratorTarget, + nullptr, this->GeneratorTarget, lang); if (!evaluatedClauncher.empty()) { compilerLauncher = evaluatedClauncher; } |