diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-09 13:48:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-09 13:48:56 (GMT) |
| commit | 06404a19796ea0bbc5fdbbc986bb526a4a84066d (patch) | |
| tree | 71992e13c6359fdcd27cf5a71d82e5975e3ef8ef /Tests | |
| parent | 347fa6169f7348f47637ee63e3ca14cee0780e68 (diff) | |
| parent | 985b4c82a64c064e1d22351091206e73ed6fc727 (diff) | |
| download | CMake-06404a19796ea0bbc5fdbbc986bb526a4a84066d.zip CMake-06404a19796ea0bbc5fdbbc986bb526a4a84066d.tar.gz CMake-06404a19796ea0bbc5fdbbc986bb526a4a84066d.tar.bz2 | |
Merge topic 'check-library-properties-fix-performances-regression'
985b4c82a6 Check link libraries properties: fix performances regression
a47eef32a3 renames method FinalizeTargetCompileInfo() in FinalizeTargetConfiguration().
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7651
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/GenEx-LINK_GROUP/forbidden-arguments-stderr.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/GenEx-LINK_LIBRARY/forbidden-arguments-stderr.txt | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/GenEx-LINK_GROUP/forbidden-arguments-stderr.txt b/Tests/RunCMake/GenEx-LINK_GROUP/forbidden-arguments-stderr.txt index bae6505..b29303b 100644 --- a/Tests/RunCMake/GenEx-LINK_GROUP/forbidden-arguments-stderr.txt +++ b/Tests/RunCMake/GenEx-LINK_GROUP/forbidden-arguments-stderr.txt @@ -1,6 +1,6 @@ -CMake Error at forbidden-arguments.cmake:[0-9]+ \(link_libraries\): - Property LINK_LIBRARIES contains the invalid item "<LINK_GROUP:feat>". The - LINK_LIBRARIES property may contain the generator-expression +CMake Error at forbidden-arguments.cmake:[0-9]+ \(add_library\): + Property LINK_LIBRARIES contains the invalid item "</LINK_GROUP:feat>". + The LINK_LIBRARIES property may contain the generator-expression "\$<LINK_GROUP:...>" which may be used to specify how the libraries are linked. Call Stack \(most recent call first\): diff --git a/Tests/RunCMake/GenEx-LINK_LIBRARY/forbidden-arguments-stderr.txt b/Tests/RunCMake/GenEx-LINK_LIBRARY/forbidden-arguments-stderr.txt index 5245dd8..fc8e383 100644 --- a/Tests/RunCMake/GenEx-LINK_LIBRARY/forbidden-arguments-stderr.txt +++ b/Tests/RunCMake/GenEx-LINK_LIBRARY/forbidden-arguments-stderr.txt @@ -1,5 +1,5 @@ -CMake Error at forbidden-arguments.cmake:[0-9]+ \(link_libraries\): - Property LINK_LIBRARIES contains the invalid item "<LINK_LIBRARY:feat>". +CMake Error at forbidden-arguments.cmake:[0-9]+ \(add_library\): + Property LINK_LIBRARIES contains the invalid item "</LINK_LIBRARY:feat>". The LINK_LIBRARIES property may contain the generator-expression "\$<LINK_LIBRARY:...>" which may be used to specify how the libraries are linked. |