diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2024-07-05 13:24:02 (GMT) |
|---|---|---|
| committer | Robert Maynard <rmaynard@nvidia.com> | 2024-07-05 17:16:47 (GMT) |
| commit | 2fc9e482a90b3e94424d3e07261b2f3540178c4c (patch) | |
| tree | b89e6140a4ec25151708c2e9b29754df08383678 /Source | |
| parent | c7232c3a2a2d4843d669ba25c0648c4e2a4ac3af (diff) | |
| download | CMake-2fc9e482a90b3e94424d3e07261b2f3540178c4c.zip CMake-2fc9e482a90b3e94424d3e07261b2f3540178c4c.tar.gz CMake-2fc9e482a90b3e94424d3e07261b2f3540178c4c.tar.bz2 | |
Evaluation of TRANSITIVE_LINK_PROPERTIES isn't considered a usage
Fixes #26108
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.h | 1 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget_Link.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget_TransitiveProperty.cxx | 3 | ||||
| -rw-r--r-- | Source/cmLinkItem.h | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 4521fd4..dd5f047 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -264,6 +264,7 @@ public: { Compile, // Usage requirements for compiling. Excludes $<LINK_ONLY>. Link, // Usage requirements for linking. Includes $<LINK_ONLY>. + LinkInterfaceEval, }; cmLinkInterfaceLibraries const* GetLinkInterfaceLibraries( diff --git a/Source/cmGeneratorTarget_Link.cxx b/Source/cmGeneratorTarget_Link.cxx index 0799429..3ed77a8 100644 --- a/Source/cmGeneratorTarget_Link.cxx +++ b/Source/cmGeneratorTarget_Link.cxx @@ -392,7 +392,7 @@ void cmGeneratorTarget::CheckLinkLibraries() const // should be a subset of LinkInterfaceMap (with LINK_ONLY left out). for (auto const& hmp : this->LinkInterfaceMap) { for (auto const& hmi : hmp.second) { - if (!hmi.second.LibrariesDone) { + if (!hmi.second.LibrariesDone || hmi.second.LinkOnlyEval) { continue; } for (cmLinkItem const& item : hmi.second.Libraries) { @@ -642,6 +642,7 @@ cmLinkInterface const* cmGeneratorTarget::GetLinkInterface( if (secondPass) { iface = cmOptionalLinkInterface(); } + iface.LinkOnlyEval = false; if (!iface.LibrariesDone) { iface.LibrariesDone = true; this->ComputeLinkInterfaceLibraries(config, iface, head, UseTo::Link); @@ -765,6 +766,7 @@ const cmLinkInterfaceLibraries* cmGeneratorTarget::GetLinkInterfaceLibraries( } cmOptionalLinkInterface& iface = hm[head]; + iface.LinkOnlyEval = (usage == UseTo::LinkInterfaceEval); if (!iface.LibrariesDone) { iface.LibrariesDone = true; this->ComputeLinkInterfaceLibraries(config, iface, head, usage); @@ -1034,6 +1036,7 @@ const cmLinkInterface* cmGeneratorTarget::GetImportLinkInterface( if (secondPass) { iface = cmOptionalLinkInterface(); } + iface.LinkOnlyEval = (usage == UseTo::LinkInterfaceEval); if (!iface.AllDone) { iface.AllDone = true; iface.LibrariesDone = true; diff --git a/Source/cmGeneratorTarget_TransitiveProperty.cxx b/Source/cmGeneratorTarget_TransitiveProperty.cxx index ac929eb..107f6d9 100644 --- a/Source/cmGeneratorTarget_TransitiveProperty.cxx +++ b/Source/cmGeneratorTarget_TransitiveProperty.cxx @@ -286,7 +286,8 @@ cmGeneratorTarget::GetCustomTransitiveProperties(std::string const& config, } } }; - addTransitiveProperties("TRANSITIVE_LINK_PROPERTIES", UseTo::Link); + addTransitiveProperties("TRANSITIVE_LINK_PROPERTIES", + UseTo::LinkInterfaceEval); addTransitiveProperties("TRANSITIVE_COMPILE_PROPERTIES", UseTo::Compile); i = ctpm.emplace(config, std::move(ctp)).first; } diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index 1946c9b..bd1531b 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -120,6 +120,7 @@ struct cmLinkInterface : public cmLinkInterfaceLibraries struct cmOptionalLinkInterface : public cmLinkInterface { + bool LinkOnlyEval = false; bool LibrariesDone = false; bool AllDone = false; bool Exists = false; |