diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2022-12-22 10:41:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-22 10:41:53 (GMT) |
| commit | aaf4367371c827635c0cf2f70a34ce59e2bcd841 (patch) | |
| tree | d8f3557cc74fe977dc5d061d1d21fd5f9444786c | |
| parent | e9dc092c765bf704f30bfbb4302ed10b3237b599 (diff) | |
| parent | 74638c47ff238f15ee7548f1084e3e9297c5395d (diff) | |
| download | CMake-aaf4367371c827635c0cf2f70a34ce59e2bcd841.zip CMake-aaf4367371c827635c0cf2f70a34ce59e2bcd841.tar.gz CMake-aaf4367371c827635c0cf2f70a34ce59e2bcd841.tar.bz2 | |
Merge topic 'STATIC_LIBRARY_OPTIONS-property-fix-genex-expension'
74638c47ff STATIC_LIBRARY_OPTIONS: ensure correct expension of list inside a genex
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8038
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 7ecdd87..d0d339d 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4856,13 +4856,10 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetStaticLibraryLinkOptions( EvaluatedTargetPropertyEntries entries; if (cmValue linkOptions = this->GetProperty("STATIC_LIBRARY_OPTIONS")) { - std::vector<std::string> options = cmExpandedList(*linkOptions); - for (const auto& option : options) { - std::unique_ptr<TargetPropertyEntry> entry = CreateTargetPropertyEntry( - *this->LocalGenerator->GetCMakeInstance(), option); - entries.Entries.emplace_back(EvaluateTargetPropertyEntry( - this, config, language, &dagChecker, *entry)); - } + std::unique_ptr<TargetPropertyEntry> entry = CreateTargetPropertyEntry( + *this->LocalGenerator->GetCMakeInstance(), *linkOptions); + entries.Entries.emplace_back(EvaluateTargetPropertyEntry( + this, config, language, &dagChecker, *entry)); } processOptions(this, entries, result, uniqueOptions, false, "static library link options", OptionsParse::Shell); |