Merge topic 'cxxmodules-depend-on-modmap-file' into release-3.28

363300ace5 cxxmodules: depend on the modmap contents
940628d48d Tests/CXXModules: test that objects depend on their modmap files
681ee92030 Tests/CXXModules: support testing rebuild conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9248

7 files changed, 63 insertions, 1 deletions

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 1d90194..99aa7f2 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -1600,7 +1600,7 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
       // corresponding file path.
       std::string ddModmapFile = cmStrCat(objectFileName, ".modmap");
       vars["DYNDEP_MODULE_MAP_FILE"] = ddModmapFile;
-      objBuild.OrderOnlyDeps.push_back(ddModmapFile);
+      objBuild.ImplicitDeps.push_back(ddModmapFile);
       scanningFiles.ModuleMapFile = std::move(ddModmapFile);
     }
 
diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
index 2a93aeb..ff78d5a 100644
--- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
@@ -147,6 +147,12 @@ function (run_cxx_module_test directory)
   if (NOT RunCMake_CXXModules_NO_TEST)
     run_cmake_command("examples/${test_name}-test" "${CMAKE_CTEST_COMMAND}" -C Debug --output-on-failure)
   endif ()
+  if (RunCMake_CXXModules_REBUILD)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
+    include("${RunCMake_TEST_SOURCE_DIR}/pre-rebuild.cmake")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
+    run_cmake_command("examples/${test_name}-rebuild" "${CMAKE_COMMAND}" --build . --config Debug)
+  endif ()
 endfunction ()
 
 function (run_cxx_module_test_target directory target)
@@ -155,6 +161,13 @@ function (run_cxx_module_test_target directory target)
   run_cxx_module_test("${directory}" ${ARGN})
 endfunction ()
 
+function (run_cxx_module_test_rebuild directory)
+  set(RunCMake_CXXModules_INSTALL 0)
+  set(RunCMake_CXXModules_NO_TEST 1)
+  set(RunCMake_CXXModules_REBUILD 1)
+  run_cxx_module_test("${directory}" ${ARGN})
+endfunction ()
+
 string(REPLACE "," ";" CMake_TEST_MODULE_COMPILATION "${CMake_TEST_MODULE_COMPILATION}")
 
 if (RunCMake_GENERATOR MATCHES "Ninja")
@@ -202,6 +215,7 @@ if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION)
   set(RunCMake_CXXModules_NO_TEST 1)
   run_cxx_module_test(req-private-other-target)
   unset(RunCMake_CXXModules_NO_TEST)
+  run_cxx_module_test_rebuild(depchain-modmap)
 endif ()
 
 # Tests which use named modules in shared libraries.
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap-rebuild-check.cmake b/Tests/RunCMake/CXXModules/examples/depchain-modmap-rebuild-check.cmake
new file mode 100644
index 0000000..1596632
--- /dev/null
+++ b/Tests/RunCMake/CXXModules/examples/depchain-modmap-rebuild-check.cmake
@@ -0,0 +1,11 @@
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  set(object_path "CMakeFiles/depchain_modmap.dir/Debug/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+else ()
+  set(object_path "CMakeFiles/depchain_modmap.dir/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+endif ()
+set(modmap_path "${object_path}.modmap")
+
+if ("${RunCMake_TEST_BINARY_DIR}/${modmap_path}" IS_NEWER_THAN "${RunCMake_TEST_BINARY_DIR}/${object_path}")
+  list(APPEND RunCMake_TEST_FAILED
+    "Object '${object_path}' should have recompiled if '${modmap_path}' changed.")
+endif ()
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/depchain-modmap/CMakeLists.txt
new file mode 100644
index 0000000..11712e9
--- /dev/null
+++ b/Tests/RunCMake/CXXModules/examples/depchain-modmap/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.28)
+project(cxx_modules_depchain_modmap CXX)
+
+include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake")
+
+add_executable(depchain_modmap)
+target_sources(depchain_modmap
+  PRIVATE
+    main.cxx
+  PRIVATE
+    FILE_SET CXX_MODULES
+      BASE_DIRS
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+      FILES
+        importable.cxx)
+target_compile_features(depchain_modmap PUBLIC cxx_std_20)
+
+add_test(NAME depchain_modmap COMMAND depchain_modmap)
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/importable.cxx b/Tests/RunCMake/CXXModules/examples/depchain-modmap/importable.cxx
new file mode 100644
index 0000000..607680a
--- /dev/null
+++ b/Tests/RunCMake/CXXModules/examples/depchain-modmap/importable.cxx
@@ -0,0 +1,6 @@
+export module importable;
+
+export int from_import()
+{
+  return 0;
+}
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/main.cxx b/Tests/RunCMake/CXXModules/examples/depchain-modmap/main.cxx
new file mode 100644
index 0000000..feb38d2
--- /dev/null
+++ b/Tests/RunCMake/CXXModules/examples/depchain-modmap/main.cxx
@@ -0,0 +1,6 @@
+import importable;
+
+int main(int argc, char* argv[])
+{
+  return from_import();
+}
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/pre-rebuild.cmake b/Tests/RunCMake/CXXModules/examples/depchain-modmap/pre-rebuild.cmake
new file mode 100644
index 0000000..f434cbe
--- /dev/null
+++ b/Tests/RunCMake/CXXModules/examples/depchain-modmap/pre-rebuild.cmake
@@ -0,0 +1,7 @@
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  set(modmap_path "CMakeFiles/depchain_modmap.dir/Debug/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}.modmap")
+else ()
+  set(modmap_path "CMakeFiles/depchain_modmap.dir/main.cxx${CMAKE_CXX_OUTPUT_EXTENSION}.modmap")
+endif ()
+
+file(TOUCH_NOCREATE "${RunCMake_TEST_BINARY_DIR}/${modmap_path}")