diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-06 13:12:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-06 13:13:05 (GMT) |
| commit | 9b051f557eef1ed99ba264f5528a00818413f34d (patch) | |
| tree | 5ea602b4920eaa7048db7b7f3f9905f9fa6240ff /Source | |
| parent | 4a8db1783ccc48bfdb9060dfff5775ba42cd94cb (diff) | |
| parent | e8792da04b7980c11e0b1b62ea618953876d1f39 (diff) | |
| download | CMake-9b051f557eef1ed99ba264f5528a00818413f34d.zip CMake-9b051f557eef1ed99ba264f5528a00818413f34d.tar.gz CMake-9b051f557eef1ed99ba264f5528a00818413f34d.tar.bz2 | |
Merge topic 'genex-LINK_LIBRARY-fix-generation' into release-3.24
e8792da04b genex-LINK_LIBRARY: ensure correct generation inside LINK_GROUP genex
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7443
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index e156e3d..850b7a3 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -549,6 +549,17 @@ bool cmComputeLinkInformation::Compute() if (linkEntry.Kind == cmComputeLinkDepends::LinkEntry::Group) { const auto& groupFeature = this->GetGroupFeature(linkEntry.Feature); if (groupFeature.Supported) { + if (linkEntry.Item.Value == "</LINK_GROUP>" && + currentFeature != nullptr) { + // emit feature suffix, if any + if (!currentFeature->Suffix.empty()) { + this->Items.emplace_back( + BT<std::string>{ currentFeature->Suffix, + this->Items.back().Value.Backtrace }, + ItemIsPath::No); + } + currentFeature = nullptr; + } this->Items.emplace_back( BT<std::string>{ linkEntry.Item.Value == "<LINK_GROUP>" ? groupFeature.Prefix |