Merge topic 'cxxmodules-transitive-modules-usage'

ec348ee4b9 cmGeneratorTarget: discover synthetic targets recursively
67466ddf65 cmExportFileGenerator: export link libraries as-is
a2e3e61a31 Tests/CXXModules: test transitive modules usage

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !9273

Source/cmExportFileGenerator.cxx

@@ -1487,11 +1487,7 @@ bool cmExportFileGenerator::PopulateCxxModuleExportProperties(
       auto value = cmGeneratorExpression::Preprocess(*prop, ctx);
       this->ResolveTargetsInGeneratorExpressions(
         value, gte, cmExportFileGenerator::ReplaceFreeTargets);
-      std::vector<std::string> wrappedValues;
-      for (auto& item : cmList{ value }) {
-        wrappedValues.push_back(cmStrCat("$<COMPILE_ONLY:", item, '>'));
-      }
-      properties[exportedPropName] = cmJoin(wrappedValues, ";");
+      properties[exportedPropName] = value;
     }
   }
 

Source/cmGeneratorTarget.cxx

@@ -8478,6 +8478,7 @@ bool cmGeneratorTarget::DiscoverSyntheticTargets(cmSyntheticTargetCache& cache,
         auto gtp = cm::make_unique<cmGeneratorTarget>(tgt, lg);
         synthDep = gtp.get();
         cache.CxxModuleTargets[targetName] = synthDep;
+        gtp->DiscoverSyntheticTargets(cache, config);
         lg->AddGeneratorTarget(std::move(gtp));
       } else {
         synthDep = cached->second;

Tests/RunCMake/CXXModules/RunCMakeTest.cmake

@@ -263,6 +263,8 @@ if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
   run_cxx_module_test(export-usage-build)
   run_cxx_module_test(export-bmi-and-interface-build)
   run_cxx_module_test(export-transitive-targets-build)
+  run_cxx_module_test(export-transitive-modules1-build)
+  run_cxx_module_test(export-transitive-modules-build export-transitive-modules-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-transitive-modules1-build-build" )
 
   if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
       "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
@@ -280,6 +282,9 @@ if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
 
     set(test_suffix export-transitive-targets-build)
     run_cxx_module_test(import-modules "import-modules-${test_suffix}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${test_suffix}-build" -DTRANSITIVE_TARGETS=1)
+
+    set(test_suffix export-transitive-modules-build)
+    run_cxx_module_test(import-modules "import-modules-${test_suffix}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${test_suffix}-build" -DTRANSITIVE_MODULES=1)
   endif ()
 endif ()
 
@@ -298,6 +303,8 @@ if ("install_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
     run_cxx_module_test(export-usage-install)
     run_cxx_module_test(export-bmi-and-interface-install)
     run_cxx_module_test(export-transitive-targets-install)
+    run_cxx_module_test(export-transitive-modules1-install)
+    run_cxx_module_test(export-transitive-modules-install export-transitive-modules-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-transitive-modules1-install-install" )
 
     if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
         "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
@@ -316,6 +323,9 @@ if ("install_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
 
       set(test_suffix export-transitive-targets-install)
       run_cxx_module_test(import-modules "import-modules-${test_suffix}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${test_suffix}-install" -DTRANSITIVE_TARGETS=1)
+
+      set(test_suffix export-transitive-modules-install)
+      run_cxx_module_test(import-modules "import-modules-${test_suffix}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${test_suffix}-install" -DTRANSITIVE_MODULES=1)
       set(RunCMake_CXXModules_INSTALL 1)
     endif ()
   endif ()

Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/CMakeLists.txt

@@ -0,0 +1,54 @@
+cmake_minimum_required(VERSION 3.24...3.28)
+project(cxx_modules_export_transitive_modules CXX)
+
+include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake")
+
+find_package(export_transitive_modules1 REQUIRED)
+
+add_library(export_transitive_modules STATIC)
+target_sources(export_transitive_modules
+  PUBLIC
+    FILE_SET modules TYPE CXX_MODULES
+      BASE_DIRS
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+      FILES
+        importable.cxx
+  )
+target_compile_features(export_transitive_modules PUBLIC cxx_std_20)
+target_link_libraries(export_transitive_modules PRIVATE CXXModules::export_transitive_modules1)
+
+install(TARGETS export_transitive_modules
+  EXPORT CXXModules
+  FILE_SET modules DESTINATION "lib/cxx/miu")
+export(EXPORT CXXModules
+  NAMESPACE CXXModules::
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules-targets.cmake"
+  CXX_MODULES_DIRECTORY "export_transitive_modules-cxx-modules")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules-config.cmake"
+  "include(CMakeFindDependencyMacro)
+set(export_transitive_modules1_DIR \"${export_transitive_modules1_DIR}\")
+find_dependency(export_transitive_modules1)
+include(\"\${CMAKE_CURRENT_LIST_DIR}/export_transitive_modules-targets.cmake\")
+set(\${CMAKE_FIND_PACKAGE_NAME}_FOUND 1)
+")
+
+set(generator
+  -G "${CMAKE_GENERATOR}")
+if (CMAKE_GENERATOR_TOOLSET)
+  list(APPEND generator
+    -T "${CMAKE_GENERATOR_TOOLSET}")
+endif ()
+if (CMAKE_GENERATOR_PLATFORM)
+  list(APPEND generator
+    -A "${CMAKE_GENERATOR_PLATFORM}")
+endif ()
+
+add_test(NAME export_transitive_modules_build
+  COMMAND
+    "${CMAKE_COMMAND}"
+    "-Dexpected_source_dir=${CMAKE_CURRENT_SOURCE_DIR}"
+    "-Dexpected_binary_dir=${CMAKE_CURRENT_BINARY_DIR}"
+    "-Dexport_transitive_modules_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+    ${generator}
+    -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
+    -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/importable.cxx

@@ -0,0 +1,7 @@
+export module importable;
+import module1;
+
+export int from_import()
+{
+  return from_inner_import();
+}

Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/test/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.28)
+project(cxx_modules_library NONE)
+
+find_package(export_transitive_modules REQUIRED)
+
+if (NOT TARGET CXXModules::export_transitive_modules1)
+  message(FATAL_ERROR
+    "Missing transitive imported target")
+endif ()
+
+if (NOT TARGET CXXModules::export_transitive_modules)
+  message(FATAL_ERROR
+    "Missing imported target")
+endif ()

Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/CMakeLists.txt

@@ -0,0 +1,57 @@
+cmake_minimum_required(VERSION 3.24...3.28)
+project(cxx_modules_export_transitive_modules CXX)
+
+include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake")
+
+find_package(export_transitive_modules1 REQUIRED)
+
+add_library(export_transitive_modules STATIC)
+target_sources(export_transitive_modules
+  PUBLIC
+    FILE_SET modules TYPE CXX_MODULES
+      BASE_DIRS
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+      FILES
+        importable.cxx
+  )
+target_compile_features(export_transitive_modules PUBLIC cxx_std_20)
+target_link_libraries(export_transitive_modules PRIVATE CXXModules::export_transitive_modules1)
+
+install(TARGETS export_transitive_modules
+  EXPORT CXXModules
+  FILE_SET modules DESTINATION "lib/cxx/miu")
+install(EXPORT CXXModules
+  NAMESPACE CXXModules::
+  DESTINATION "lib/cmake/export_transitive_modules"
+  FILE "export_transitive_modules-targets.cmake"
+  CXX_MODULES_DIRECTORY "export_transitive_modules-cxx-modules")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules-config.cmake"
+  "include(CMakeFindDependencyMacro)
+set(export_transitive_modules1_DIR \"${export_transitive_modules1_DIR}\")
+find_dependency(export_transitive_modules1)
+include(\"\${CMAKE_CURRENT_LIST_DIR}/export_transitive_modules-targets.cmake\")
+set(\${CMAKE_FIND_PACKAGE_NAME}_FOUND 1)
+")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules-config.cmake"
+  DESTINATION "lib/cmake/export_transitive_modules")
+
+set(generator
+  -G "${CMAKE_GENERATOR}")
+if (CMAKE_GENERATOR_TOOLSET)
+  list(APPEND generator
+    -T "${CMAKE_GENERATOR_TOOLSET}")
+endif ()
+if (CMAKE_GENERATOR_PLATFORM)
+  list(APPEND generator
+    -A "${CMAKE_GENERATOR_PLATFORM}")
+endif ()
+
+add_test(NAME export_transitive_modules_build
+  COMMAND
+    "${CMAKE_COMMAND}"
+    "-Dexpected_source_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/miu"
+    "-Dexpected_binary_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/bmi"
+    "-Dexport_transitive_modules_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_transitive_modules"
+    ${generator}
+    -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
+    -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/importable.cxx

@@ -0,0 +1,7 @@
+export module importable;
+import module1;
+
+export int from_import()
+{
+  return from_inner_import();
+}

Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/test/CMakeLists.txt

@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.28)
+project(cxx_modules_library NONE)
+
+find_package(export_transitive_modules REQUIRED)
+
+if (NOT TARGET CXXModules::export_transitive_modules1)
+  message(FATAL_ERROR
+    "Missing transitive imported target")
+endif ()
+
+if (NOT TARGET CXXModules::export_transitive_modules)
+  message(FATAL_ERROR
+    "Missing imported target")
+endif ()

Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/CMakeLists.txt

@@ -0,0 +1,48 @@
+cmake_minimum_required(VERSION 3.24...3.28)
+project(cxx_modules_export_transitive_modules1 CXX)
+
+include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake")
+
+add_library(export_transitive_modules1 STATIC)
+target_sources(export_transitive_modules1
+  PUBLIC
+    FILE_SET modules TYPE CXX_MODULES
+      BASE_DIRS
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+      FILES
+        importable.cxx
+  )
+target_compile_features(export_transitive_modules1 PUBLIC cxx_std_20)
+
+install(TARGETS export_transitive_modules1
+  EXPORT CXXModules
+  FILE_SET modules DESTINATION "lib/cxx/miu")
+export(EXPORT CXXModules
+  NAMESPACE CXXModules::
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules1-targets.cmake"
+  CXX_MODULES_DIRECTORY "export_transitive_modules1-cxx-modules")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules1-config.cmake"
+  "include(\"\${CMAKE_CURRENT_LIST_DIR}/export_transitive_modules1-targets.cmake\")
+set(\${CMAKE_FIND_PACKAGE_NAME}_FOUND 1)
+")
+
+set(generator
+  -G "${CMAKE_GENERATOR}")
+if (CMAKE_GENERATOR_TOOLSET)
+  list(APPEND generator
+    -T "${CMAKE_GENERATOR_TOOLSET}")
+endif ()
+if (CMAKE_GENERATOR_PLATFORM)
+  list(APPEND generator
+    -A "${CMAKE_GENERATOR_PLATFORM}")
+endif ()
+
+add_test(NAME export_transitive_modules1_build
+  COMMAND
+    "${CMAKE_COMMAND}"
+    "-Dexpected_source_dir=${CMAKE_CURRENT_SOURCE_DIR}"
+    "-Dexpected_binary_dir=${CMAKE_CURRENT_BINARY_DIR}"
+    "-Dexport_transitive_modules1_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+    ${generator}
+    -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
+    -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/importable.cxx

@@ -0,0 +1,6 @@
+export module module1;
+
+export int from_inner_import()
+{
+  return 0;
+}

Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/test/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.28)
+project(cxx_modules_library NONE)
+
+find_package(export_transitive_modules1 REQUIRED)
+
+if (NOT TARGET CXXModules::export_transitive_modules1)
+  message(FATAL_ERROR
+    "Missing imported target")
+endif ()

Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/CMakeLists.txt

@@ -0,0 +1,51 @@
+cmake_minimum_required(VERSION 3.24...3.28)
+project(cxx_modules_export_transitive_modules1 CXX)
+
+include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake")
+
+add_library(export_transitive_modules1 STATIC)
+target_sources(export_transitive_modules1
+  PUBLIC
+    FILE_SET modules TYPE CXX_MODULES
+      BASE_DIRS
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+      FILES
+        importable.cxx
+  )
+target_compile_features(export_transitive_modules1 PUBLIC cxx_std_20)
+
+install(TARGETS export_transitive_modules1
+  EXPORT CXXModules
+  FILE_SET modules DESTINATION "lib/cxx/miu")
+install(EXPORT CXXModules
+  NAMESPACE CXXModules::
+  DESTINATION "lib/cmake/export_transitive_modules1"
+  FILE "export_transitive_modules1-targets.cmake"
+  CXX_MODULES_DIRECTORY "export_transitive_modules1-cxx-modules")
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules1-config.cmake"
+  "include(\"\${CMAKE_CURRENT_LIST_DIR}/export_transitive_modules1-targets.cmake\")
+set(\${CMAKE_FIND_PACKAGE_NAME}_FOUND 1)
+")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/export_transitive_modules1-config.cmake"
+  DESTINATION "lib/cmake/export_transitive_modules1")
+
+set(generator
+  -G "${CMAKE_GENERATOR}")
+if (CMAKE_GENERATOR_TOOLSET)
+  list(APPEND generator
+    -T "${CMAKE_GENERATOR_TOOLSET}")
+endif ()
+if (CMAKE_GENERATOR_PLATFORM)
+  list(APPEND generator
+    -A "${CMAKE_GENERATOR_PLATFORM}")
+endif ()
+
+add_test(NAME export_transitive_modules1_build
+  COMMAND
+    "${CMAKE_COMMAND}"
+    "-Dexpected_source_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/miu"
+    "-Dexpected_binary_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/bmi"
+    "-Dexport_transitive_modules1_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_transitive_modules1"
+    ${generator}
+    -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
+    -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/importable.cxx

@@ -0,0 +1,6 @@
+export module module1;
+
+export int from_inner_import()
+{
+  return 0;
+}

Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/test/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.28)
+project(cxx_modules_library NONE)
+
+find_package(export_transitive_modules1 REQUIRED)
+
+if (NOT TARGET CXXModules::export_transitive_modules1)
+  message(FATAL_ERROR
+    "Missing imported target")
+endif ()

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 ()

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 ()

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

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

Tests/RunCMake/CXXModules/examples/import-modules/CMakeLists.txt

@@ -13,6 +13,8 @@ elseif (FROM_NINJA)
   set(package_name "export_from_ninja")
 elseif (TRANSITIVE_TARGETS)
   set(package_name "export_transitive_targets")
+elseif (TRANSITIVE_MODULES)
+  set(package_name "export_transitive_modules")
 else ()
   set(package_name "export_interfaces")
 endif ()