diff options
author | Marc Chevrier <marc.chevrier@gmail.com> | 2022-01-31 16:43:41 +0100 |
---|---|---|
committer | Marc Chevrier <marc.chevrier@gmail.com> | 2022-02-28 10:26:26 +0100 |
commit | 0a81ea1f12cbaf60ec60b8e4a27c5ea476a655de (patch) | |
tree | 8491b1ae05b5c252b1165244c6976d81c87397ee /Source/cmMakefile.cxx | |
parent | a9928eb4a54431780d589f70460e5715258f1d27 (diff) | |
download | cmake-0a81ea1f12cbaf60ec60b8e4a27c5ea476a655de.tar.gz |
Genex-LINK_GROUP: Add possibility to group libraries at link step
Fixes: #23121
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6a5d518a92..be189a6106 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3988,21 +3988,21 @@ void cmMakefile::CheckProperty(const std::string& prop) const if (prop == "LINK_LIBRARIES") { if (cmValue value = this->GetProperty(prop)) { // Look for <LINK_LIBRARY:> internal pattern - 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. this->IssueMessage( MessageType::FATAL_ERROR, - cmStrCat( - "Property ", prop, " contains the invalid item \"", - linkLibrary.match(2), "\". The ", prop, - " property may contain the generator-expression " - "\"$<LINK_LIBRARY:...>\" " - "which may be used to specify how the libraries are linked.")); + cmStrCat("Property ", prop, " contains the invalid item \"", + linkPattern.match(2), "\". The ", prop, + " property may contain the generator-expression \"$<LINK_", + linkPattern.match(3), + ":...>\" which may be used to specify how the libraries are " + "linked.")); } } } |