diff options
| author | Brad King <brad.king@kitware.com> | 2022-01-05 20:14:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-01-29 11:48:12 (GMT) |
| commit | f3e9e03fe023678fcee16699864e8763b18e9763 (patch) | |
| tree | 9c03352d6f5e8bef2fc4292e2d991ce9f3d32023 /Source | |
| parent | 216aa149974a179d49094e53f553741e2c385920 (diff) | |
| download | CMake-f3e9e03fe023678fcee16699864e8763b18e9763.zip CMake-f3e9e03fe023678fcee16699864e8763b18e9763.tar.gz CMake-f3e9e03fe023678fcee16699864e8763b18e9763.tar.bz2 | |
cmGeneratorTarget: Simplify CMP0022 warning check
Since commit 1d709ea2f5 (cmGeneratorTarget: Propagate backtraces from
INTERFACE_LINK_LIBRARIES, 2021-12-15) we can use the special storage of
the property directly.
Diffstat (limited to 'Source')
| -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 f8fa593..7fb2a5d 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -57,6 +57,7 @@ using LinkInterfaceFor = cmGeneratorTarget::LinkInterfaceFor; const cmsys::RegularExpression FrameworkRegularExpression( "^(.*/)?([^/]*)\\.framework/(.*)$"); +const std::string kINTERFACE_LINK_LIBRARIES = "INTERFACE_LINK_LIBRARIES"; } template <> @@ -7250,13 +7251,9 @@ void cmGeneratorTarget::ComputeLinkInterfaceLibraries( // Compare the link implementation fallback link interface to the // preferred new link interface property and warn if different. cmLinkInterface ifaceNew; - static const std::string newProp = "INTERFACE_LINK_LIBRARIES"; - if (cmValue newExplicitLibraries = this->GetProperty(newProp)) { - std::vector<BT<std::string>> entries; - entries.emplace_back(*newExplicitLibraries); - this->ExpandLinkItems(linkIfaceProp, cmMakeRange(entries), config, - headTarget, interfaceFor, ifaceNew); - } + this->ExpandLinkItems(kINTERFACE_LINK_LIBRARIES, + this->Target->GetLinkInterfaceEntries(), config, + headTarget, interfaceFor, ifaceNew); if (ifaceNew.Libraries != iface.Libraries) { std::string oldLibraries = cmJoin(impl->Libraries, ";"); std::string newLibraries = cmJoin(ifaceNew.Libraries, ";"); |