diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-21 18:37:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-21 18:37:43 (GMT) |
| commit | 74957cacf861eea1d99287dc2efcd1c107c29420 (patch) | |
| tree | d1858f8c99b176828bcc85d3baacdcdb7b82d5d5 | |
| parent | c66396699bcf3007ce6fe7a1c9735cb18fef4228 (diff) | |
| parent | f0df692d21029326112bb91e236f2c4e9a6526a2 (diff) | |
| download | CMake-74957cacf861eea1d99287dc2efcd1c107c29420.zip CMake-74957cacf861eea1d99287dc2efcd1c107c29420.tar.gz CMake-74957cacf861eea1d99287dc2efcd1c107c29420.tar.bz2 | |
Merge topic 'cxxmodules-transitive-std' into release-3.29
f0df692d21 Tests/CXXModules: test `cxx_std_20` coming from a dependency
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9276
| -rw-r--r-- | Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt index 99ec585..435f949 100644 --- a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt @@ -6,6 +6,7 @@ include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake") add_library(usage_reqs INTERFACE include/include.h includes/includes.h) +target_compile_features(usage_reqs INTERFACE cxx_std_20) target_compile_definitions(usage_reqs INTERFACE FROM_USAGE_REQS) @@ -32,7 +33,6 @@ target_sources(export_transitive_targets importable.cxx subdir/importable.cxx ) -target_compile_features(export_transitive_targets PUBLIC cxx_std_20) target_link_libraries(export_transitive_targets PRIVATE usage_reqs) add_library(no_modules STATIC no_modules.cxx) diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt index dd1eb01..f413f02 100644 --- a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt @@ -6,6 +6,7 @@ include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake") add_library(usage_reqs INTERFACE include/include.h includes/includes.h) +target_compile_features(usage_reqs INTERFACE cxx_std_20) target_compile_definitions(usage_reqs INTERFACE FROM_USAGE_REQS) @@ -33,7 +34,6 @@ target_sources(export_transitive_targets importable.cxx subdir/importable.cxx ) -target_compile_features(export_transitive_targets PUBLIC cxx_std_20) target_link_libraries(export_transitive_targets PRIVATE usage_reqs) add_library(no_modules STATIC no_modules.cxx) |