diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-27 13:10:24 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-27 09:10:30 -0400 |
| commit | 34a5163fecebf86d93277830a673fabdd53da82c (patch) | |
| tree | fb8ac1028be325675c8f759dc5514cdc5d1f0dcc /Source | |
| parent | e55c86873e87ef464b49bec944948273ce38e4ca (diff) | |
| parent | 2ae72ef74b1a8b3034c4685de68f39d1e198a84c (diff) | |
| download | cmake-34a5163fecebf86d93277830a673fabdd53da82c.tar.gz | |
Merge topic 'xcode-link-TARGET_OBJECTS'
2ae72ef74b Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIES
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6161
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index e2ec82a5e2..a7d825deb9 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -6291,6 +6291,7 @@ void cmGeneratorTarget::ExpandLinkItems( } std::vector<std::string> libs; std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value); + cge->SetEvaluateForBuildsystem(true); cmExpandList(cge->Evaluate(this->LocalGenerator, config, headTarget, &dagChecker, this, headTarget->LinkerLanguage), libs); @@ -7428,6 +7429,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries( nullptr); cmGeneratorExpression ge(*btIt); std::unique_ptr<cmCompiledGeneratorExpression> const cge = ge.Parse(*le); + cge->SetEvaluateForBuildsystem(true); std::string const& evaluated = cge->Evaluate(this->LocalGenerator, config, head, &dagChecker, nullptr, this->LinkerLanguage); |