mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 05:40:54 -06:00
GenEx: Collect evaluation arguments into local Context structures
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
#include <cmext/string_view>
|
||||
|
||||
#include "cmComputeLinkInformation.h"
|
||||
#include "cmGenExContext.h"
|
||||
#include "cmGeneratorExpression.h"
|
||||
#include "cmGeneratorExpressionDAGChecker.h"
|
||||
#include "cmGeneratorTarget.h"
|
||||
@@ -521,13 +522,14 @@ std::string cmCommonTargetGenerator::GetLinkerLauncher(
|
||||
std::string propName = lang + "_LINKER_LAUNCHER";
|
||||
cmValue launcherProp = this->GeneratorTarget->GetProperty(propName);
|
||||
if (cmNonempty(launcherProp)) {
|
||||
cm::GenEx::Context context(this->LocalCommonGenerator, config, lang);
|
||||
cmGeneratorExpressionDAGChecker dagChecker{
|
||||
this->GeneratorTarget, propName, nullptr, nullptr,
|
||||
this->LocalCommonGenerator, config,
|
||||
this->GeneratorTarget, propName, nullptr, nullptr, context.LG,
|
||||
context.Config
|
||||
};
|
||||
std::string evaluatedLinklauncher = cmGeneratorExpression::Evaluate(
|
||||
*launcherProp, this->LocalCommonGenerator, config, this->GeneratorTarget,
|
||||
&dagChecker, this->GeneratorTarget, lang);
|
||||
*launcherProp, context.LG, context.Config, this->GeneratorTarget,
|
||||
&dagChecker, this->GeneratorTarget, context.Language);
|
||||
// Convert ;-delimited list to single string
|
||||
cmList args{ evaluatedLinklauncher, cmList::EmptyElements::Yes };
|
||||
if (!args.empty()) {
|
||||
|
||||
Reference in New Issue
Block a user