Răsfoiți Sursa

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 <[email protected]>
Tested-by: buildbot <[email protected]>
Merge-request: !8038
Marc Chevrier 3 ani în urmă
părinte
comite
aaf4367371
1 a modificat fișierele cu 4 adăugiri și 7 ștergeri
  1. 4 7
      Source/cmGeneratorTarget.cxx

+ 4 - 7
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);