瀏覽代碼

Merge topic 'cxxmodules-transitive-std' into release-3.29

f0df692d21 Tests/CXXModules: test `cxx_std_20` coming from a dependency

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !9276
Brad King 1 年之前
父節點
當前提交
74957cacf8

+ 1 - 1
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)

+ 1 - 1
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)