diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-01 13:46:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-01 13:46:09 (GMT) |
| commit | d687047f99b7fd16c8d6f9b95c44b865426c3ca4 (patch) | |
| tree | 521889b60859f608aaff623fba23ab0b761c6773 /Source/cmTarget.cxx | |
| parent | 1a46bc0d2b8e26eb96cb05d1fa4c97781ab503c1 (diff) | |
| parent | 0a81ea1f12cbaf60ec60b8e4a27c5ea476a655de (diff) | |
| download | CMake-d687047f99b7fd16c8d6f9b95c44b865426c3ca4.zip CMake-d687047f99b7fd16c8d6f9b95c44b865426c3ca4.tar.gz CMake-d687047f99b7fd16c8d6f9b95c44b865426c3ca4.tar.bz2 | |
Merge topic 'genex-LINK_GROUP'
0a81ea1f12 Genex-LINK_GROUP: Add possibility to group libraries at link step
a9928eb4a5 SunPro C: ensure LINKER: prefix is usable for all versions
01ff75b2ff cmComputeDepends::LinkEntry: introduce enum to specify item type
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7005
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 92a0ac4..4ca1b9b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1788,20 +1788,21 @@ void CheckLinkLibraryPattern(const std::string& property, const std::string& value, cmMakefile* context) { // Look for <LINK_LIBRARY:> and </LINK_LIBRARY:> internal tags - static cmsys::RegularExpression linkLibrary( - "(^|;)(</?LINK_LIBRARY:[^;>]*>)(;|$)"); - if (!linkLibrary.find(value)) { + static cmsys::RegularExpression linkPattern( + "(^|;)(</?LINK_(LIBRARY|GROUP):[^;>]*>)(;|$)"); + if (!linkPattern.find(value)) { return; } // Report an error. context->IssueMessage( MessageType::FATAL_ERROR, - cmStrCat("Property ", property, " contains the invalid item \"", - linkLibrary.match(2), "\". The ", property, - " property may contain the generator-expression " - "\"$<LINK_LIBRARY:...>\" " - "which may be used to specify how the libraries are linked.")); + cmStrCat( + "Property ", property, " contains the invalid item \"", + linkPattern.match(2), "\". The ", property, + " property may contain the generator-expression \"$<LINK_", + linkPattern.match(3), + ":...>\" which may be used to specify how the libraries are linked.")); } void CheckLINK_INTERFACE_LIBRARIES(const std::string& prop, |