[Openmp-commits] [llvm] [openmp] [flang-rt][openmp] Add file-level dependencies for builtin mod files (PR #204260)

[Eugene Epshteyn via Openmp-commits]

================
@@ -292,17 +292,35 @@ if (FLANG_RT_FORTRAN_MODULES)
   # (https://gitlab.kitware.com/cmake/cmake/-/issues/26803)
   # As a workaround, we build those intrinsic modules first such that the main
   # runtime can depend on it.
-  add_flangrt_library(flang_rt.mod.intrinsics OBJECT
-    ${intrinsics_sources}
+  add_flangrt_library(flang_rt.mod.fortran.builtins OBJECT
+    __fortran_builtins.f90
   )
-  flang_module_target(flang_rt.mod.intrinsics PUBLIC)
-  add_module_barrier(flang_rt.mod.intrinsics.barrier flang_rt.mod.intrinsics)
+  flang_module_target(flang_rt.mod.fortran.builtins PUBLIC)
+  add_module_barrier(flang_rt.mod.fortran.builtins.barrier flang_rt.mod.fortran.builtins)
+
+  add_flangrt_library(flang_rt.mod.cuda.builtins OBJECT
+    __cuda_builtins.f90
+  )
+  add_dependencies(flang_rt.mod.cuda.builtins flang_rt.mod.fortran.builtins.barrier)
+  set_property(SOURCE __cuda_builtins.f90
+    APPEND PROPERTY OBJECT_DEPENDS
+      "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/flang_rt.mod.builtins.dir/${CMAKE_CFG_INTDIR}/__fortran_builtins.f90${CMAKE_Fortran_OUTPUT_EXTENSION}"
+  )
+  flang_module_target(flang_rt.mod.cuda.builtins PUBLIC)
+  add_module_barrier(flang_rt.mod.cuda.builtins.barrier flang_rt.mod.cuda.builtins)
 
   # The modules themselves
   add_flangrt_library(flang_rt.mod OBJECT
     ${module_sources}
   )
-  add_dependencies(flang_rt.mod flang_rt.mod.intrinsics.barrier)
+  add_dependencies(flang_rt.mod flang_rt.mod.fortran.builtins.barrier flang_rt.mod.cuda.builtins.barrier)
+  foreach(_srcfile IN LISTS module_sources)
+    set_property(SOURCE ${_srcfile}
+      APPEND PROPERTY OBJECT_DEPENDS
+        "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/flang_rt.mod.builtins.dir/${CMAKE_CFG_INTDIR}/__fortran_builtins.f90${CMAKE_Fortran_OUTPUT_EXTENSION}"
----------------
eugeneepshteyn wrote:

`flang_rt.mod.fortran.builtins.dir`? (Missing `.fortran`)

https://github.com/llvm/llvm-project/pull/204260