diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-16 13:15:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-16 14:47:32 (GMT) |
| commit | add64399c54859d26f9954fb06d616dbd00bffe7 (patch) | |
| tree | 8d1008e2cec9417057c7371738d93fccc830b489 /Tests/CMakeCommands | |
| parent | 790c225208d389b332828014b55894e9f9c5d0e8 (diff) | |
| download | CMake-add64399c54859d26f9954fb06d616dbd00bffe7.zip CMake-add64399c54859d26f9954fb06d616dbd00bffe7.tar.gz CMake-add64399c54859d26f9954fb06d616dbd00bffe7.tar.bz2 | |
target_link_libraries: Restore LINK_ONLY for multiple static lib dependencies
Since commit c1e812ad4f (target_link_libraries: Improve tolerance of
unquoted generator expressions, 2022-02-15, v3.23.0-rc2~11^2) we
accumulate consecutive non-keyword arguments to recover an unquoted
generator expression as a single entry. When given multiple consecutive
non-genex library names, the grouping breaks our logic that expects each
entry is either a raw target name or a genex. Revise the logic to only
accumulate multiple arguments when they end inside a partial genex.
This bug caused `target_link_libraries` to stop wrapping static library
private dependencies in `$<LINK_ONLY:...>` for `INTERFACE_LINK_LIBRARIES`
when multiple consecutive library names are given. Add a test case
covering that behavior.
Fixes: #23302
Diffstat (limited to 'Tests/CMakeCommands')
3 files changed, 28 insertions, 0 deletions
diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt index ca6309b..ebade02 100644 --- a/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt +++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/CMakeLists.txt @@ -33,6 +33,22 @@ add_library(staticlib2 STATIC staticlib2.cpp) generate_export_header(staticlib2) target_link_libraries(staticlib1 LINK_PUBLIC staticlib2) +# Test adding LINK_ONLY to each of multiple specified libraries. +add_library(staticlib2iface1 INTERFACE) +add_library(staticlib2iface2 INTERFACE) +target_compile_definitions(staticlib2iface1 INTERFACE STATICLIB2_IFACE_1) +target_compile_definitions(staticlib2iface2 INTERFACE STATICLIB2_IFACE_2) +target_link_libraries(staticlib2 PRIVATE staticlib2iface1 staticlib2iface2) + +# Test adding unquoted genex with ';' to LINK_LIBRARIES and INTERFACE_LINK_LIBRARIES. +target_link_libraries(staticlib2 + PUBLIC $<0:imp::missing1;imp::missing2> + PRIVATE $<0:imp::missing3;imp::missing4> + INTERFACE $<0:imp::missing5;imp::missing6> + ) +assert_property(staticlib2 INTERFACE_LINK_LIBRARIES "$<LINK_ONLY:staticlib2iface1>;$<LINK_ONLY:staticlib2iface2>;$<0:imp::missing1;imp::missing2>;$<LINK_ONLY:$<0:imp::missing3;imp::missing4>>;$<0:imp::missing5;imp::missing6>") +assert_property(staticlib2 LINK_LIBRARIES "staticlib2iface1;staticlib2iface2;$<0:imp::missing1;imp::missing2>;$<0:imp::missing3;imp::missing4>") + # Try adding a private link item to be propagated out of a static lib. set(private_link "") if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID MATCHES LCC) diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp index d6b3986..d7f3e7c 100644 --- a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp +++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib1.cpp @@ -1,3 +1,9 @@ +#ifdef STATICLIB2_IFACE_1 +# error "STATICLIB2_IFACE_1 incorrectly defined" +#endif +#ifdef STATICLIB2_IFACE_2 +# error "STATICLIB2_IFACE_2 incorrectly defined" +#endif int staticlib1() { diff --git a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp index bd1a901..caa4143 100644 --- a/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp +++ b/Tests/CMakeCommands/target_link_libraries/cmp0022/staticlib2.cpp @@ -1,3 +1,9 @@ +#ifndef STATICLIB2_IFACE_1 +# error "STATICLIB2_IFACE_1 incorrectly not defined" +#endif +#ifndef STATICLIB2_IFACE_2 +# error "STATICLIB2_IFACE_2 incorrectly not defined" +#endif int staticlib2() { |