diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2024-02-20 12:38:58 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2024-02-20 15:53:31 (GMT) |
| commit | 67466ddf65aafa02a19225b306bd712c2be3fb7f (patch) | |
| tree | c9544ff16b85e5455e071b95e41317c0a23bdeec /Tests | |
| parent | a2e3e61a3189f56668364aa79cae97da1830231f (diff) | |
| download | CMake-67466ddf65aafa02a19225b306bd712c2be3fb7f.zip CMake-67466ddf65aafa02a19225b306bd712c2be3fb7f.tar.gz CMake-67466ddf65aafa02a19225b306bd712c2be3fb7f.tar.bz2 | |
cmExportFileGenerator: export link libraries as-is
This allows for transitive modules to work because
`$<COMPILE_ONLY>`-wrapped dependencies do not end up in the
`linked-target-dirs` collator property. Test suite exported property
tests updated to account for the change.
Diffstat (limited to 'Tests')
4 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/test/CMakeLists.txt index 8e70576..4c6eefd 100644 --- a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/test/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/test/CMakeLists.txt @@ -10,7 +10,7 @@ endif () get_property(transitive_targets TARGET CXXModules::export_transitive_targets PROPERTY IMPORTED_CXX_MODULES_LINK_LIBRARIES) -if (NOT transitive_targets STREQUAL "$<COMPILE_ONLY:CXXModules::usage_reqs>") +if (NOT transitive_targets STREQUAL "CXXModules::usage_reqs") message(FATAL_ERROR "Incorrect transitive link library in C++ module interface CXXModules::export_transitive_targets:\n ${transitive_targets}") endif () diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/test/CMakeLists.txt index 8e70576..4c6eefd 100644 --- a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/test/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/test/CMakeLists.txt @@ -10,7 +10,7 @@ endif () get_property(transitive_targets TARGET CXXModules::export_transitive_targets PROPERTY IMPORTED_CXX_MODULES_LINK_LIBRARIES) -if (NOT transitive_targets STREQUAL "$<COMPILE_ONLY:CXXModules::usage_reqs>") +if (NOT transitive_targets STREQUAL "CXXModules::usage_reqs") message(FATAL_ERROR "Incorrect transitive link library in C++ module interface CXXModules::export_transitive_targets:\n ${transitive_targets}") endif () diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/export-usage-build/test/CMakeLists.txt index c84153d..a88c915 100644 --- a/Tests/RunCMake/CXXModules/examples/export-usage-build/test/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/export-usage-build/test/CMakeLists.txt @@ -41,7 +41,7 @@ check_property("/usr/exported;/usr/buildiface" "IMPORTED_CXX_MODULES_INCLUDE_DIR check_property("exported;buildiface" "IMPORTED_CXX_MODULES_COMPILE_DEFINITIONS") check_property("cxx_std_20;cxx_std_11;cxx_std_14" "IMPORTED_CXX_MODULES_COMPILE_FEATURES") check_property("${export_interfaces_flag}100;${export_interfaces_flag}200" "IMPORTED_CXX_MODULES_COMPILE_OPTIONS") -check_property("$<COMPILE_ONLY:CXXModules::export_used>;$<COMPILE_ONLY:CXXModules::export_build>" "IMPORTED_CXX_MODULES_LINK_LIBRARIES") +check_property("CXXModules::export_used;CXXModules::export_build" "IMPORTED_CXX_MODULES_LINK_LIBRARIES") # Extract the export-dependent targets from the export file. file(STRINGS "${export_usage_DIR}/export_usage-targets.cmake" usage_dependent_targets diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/export-usage-install/test/CMakeLists.txt index ceb428b..67ce30a 100644 --- a/Tests/RunCMake/CXXModules/examples/export-usage-install/test/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/export-usage-install/test/CMakeLists.txt @@ -41,7 +41,7 @@ check_property("/usr/exported;/usr/installiface" "IMPORTED_CXX_MODULES_INCLUDE_D check_property("exported;installiface" "IMPORTED_CXX_MODULES_COMPILE_DEFINITIONS") check_property("cxx_std_20;cxx_std_11;cxx_std_17" "IMPORTED_CXX_MODULES_COMPILE_FEATURES") check_property("${export_interfaces_flag}100;${export_interfaces_flag}300" "IMPORTED_CXX_MODULES_COMPILE_OPTIONS") -check_property("$<COMPILE_ONLY:CXXModules::export_used>;$<COMPILE_ONLY:CXXModules::export_install>" "IMPORTED_CXX_MODULES_LINK_LIBRARIES") +check_property("CXXModules::export_used;CXXModules::export_install" "IMPORTED_CXX_MODULES_LINK_LIBRARIES") # Extract the export-dependent targets from the export file. file(STRINGS "${export_usage_DIR}/export_usage-targets.cmake" usage_dependent_targets |