echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmTarget: simplify CheckLinkLibraryPattern

Browse Source 
Now that usage properties have more of a representation, the function
can just take the requirement directly.
This commit is contained in:
Ben Boeckel 2023-01-28 11:01:29 -05:00
parent 22b9ce73e7
commit 33f629184f
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmTarget.cxx
View File

@ -1984,8 +1984,7 @@ void cmTarget::AppendBuildInterfaceIncludes()
}
namespace {
bool CheckLinkLibraryPattern(cm::string_view property,
const std::vector<BT<std::string>>& value,
bool CheckLinkLibraryPattern(UsageRequirementProperty const& usage,
cmake* context)
{
// Look for <LINK_LIBRARY:> and </LINK_LIBRARY:> internal tags
@ -1994,7 +1993,7 @@ bool CheckLinkLibraryPattern(cm::string_view property,
bool isValid = true;
for (const auto& item : value) {
for (const auto& item : usage.Entries) {
if (!linkPattern.find(item.Value)) {
continue;
}
@ -2005,8 +2004,8 @@ bool CheckLinkLibraryPattern(cm::string_view property,
context->IssueMessage(
MessageType::FATAL_ERROR,
cmStrCat(
"Property ", property, " contains the invalid item \"",
linkPattern.match(2), "\". The ", property,
"Property ", usage.Name, " contains the invalid item \"",
linkPattern.match(2), "\". The ", usage.Name,
" property may contain the generator-expression \"$<LINK_",
linkPattern.match(3),
":...>\" which may be used to specify how the libraries are linked."),
@ -2025,16 +2024,12 @@ void cmTarget::FinalizeTargetConfiguration(
return;
}
if (!CheckLinkLibraryPattern("LINK_LIBRARIES"_s,
this->impl->LinkLibraries.Entries,
if (!CheckLinkLibraryPattern(this->impl->LinkLibraries,
this->GetMakefile()->GetCMakeInstance()) ||
!CheckLinkLibraryPattern("INTERFACE_LINK_LIBRARIES"_s,
this->impl->InterfaceLinkLibraries.Entries,
!CheckLinkLibraryPattern(this->impl->InterfaceLinkLibraries,
this->GetMakefile()->GetCMakeInstance()) ||
!CheckLinkLibraryPattern(
"INTERFACE_LINK_LIBRARIES_DIRECT"_s,
this->impl->InterfaceLinkLibrariesDirect.Entries,
this->GetMakefile()->GetCMakeInstance())) {
!CheckLinkLibraryPattern(this->impl->InterfaceLinkLibrariesDirect,
this->GetMakefile()->GetCMakeInstance())) {
return;
}