use a unique fortran module directory for each example

LLNL · Jun 17, 2024 · c1573be · c1573be
1 parent 717798f
commit c1573be
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 24 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -17,9 +17,9 @@
 # We need this to ensure the installed templates have MPI when ENABLE_MPI=TRUE,
 # at least until we convert all of the templates to use the SUNDIALS CMake target.
 
-# ===============================================================
+# ===================================================================
 # Configure compilers for installed examples
-# ===============================================================
+# ===================================================================
 
 foreach(lang ${_SUNDIALS_ENABLED_LANGS})
   if(ENABLE_MPI)
@@ -37,7 +37,13 @@ if(ENABLE_ALL_WARNINGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
 endif()
 
+# Initialize CMAKE_Fortran_MODULE_DIRECTORY for examples
+set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+# ===================================================================
 # Set variables used in generating CMake and Makefiles for examples
+# ===================================================================
+
 if(EXAMPLES_INSTALL)
 
   set(SHELL "sh")
@@ -95,9 +101,9 @@ if(EXAMPLES_INSTALL)
 
 endif()
 
-#----------------------------------------
+# ===================================================================
 # Add specific examples
-#----------------------------------------
+# ===================================================================
 
 # Add ARKode examples
 if(BUILD_ARKODE)

diff --git a/examples/arkode/F2003_serial/CMakeLists.txt b/examples/arkode/F2003_serial/CMakeLists.txt
@@ -129,7 +129,7 @@ if(BUILD_SUNLINSOL_KLU)
     add_executable(${example} ${example}.f90)
 
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # add example to regression tests
     sundials_add_test(${example} ${example}

diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
@@ -115,7 +115,7 @@ foreach(example_tuple ${nvector_openmp_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example} ${SUNDIALS_LIBS})

diff --git a/examples/nvector/manyvector/CMakeLists.txt b/examples/nvector/manyvector/CMakeLists.txt
@@ -112,7 +112,7 @@ foreach(example_tuple ${nvector_manyvector_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example} ${SUNDIALS_LIBS})

diff --git a/examples/nvector/mpimanyvector/CMakeLists.txt b/examples/nvector/mpimanyvector/CMakeLists.txt
@@ -153,7 +153,7 @@ foreach(example_tuple ${nvector_mpimanyvector_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example} ${SUNDIALS_LIBS})

diff --git a/examples/nvector/mpiplusx/CMakeLists.txt b/examples/nvector/mpiplusx/CMakeLists.txt
@@ -151,7 +151,7 @@ foreach(example_tuple ${nvector_mpiplusx_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example} ${SUNDIALS_LIBS})

diff --git a/examples/nvector/parallel/CMakeLists.txt b/examples/nvector/parallel/CMakeLists.txt
@@ -140,7 +140,7 @@ foreach(example_tuple ${nvector_parallel_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
@@ -115,7 +115,7 @@ foreach(example_tuple ${nvector_pthreads_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example} ${SUNDIALS_LIBS} ${CMAKE_THREAD_LIBS_INIT})

diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
@@ -109,7 +109,7 @@ foreach(example_tuple ${nvector_serial_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # folder where fortran .mod files are
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example} ${SUNDIALS_LIBS})

diff --git a/examples/sunlinsol/band/CMakeLists.txt b/examples/sunlinsol/band/CMakeLists.txt
@@ -106,7 +106,7 @@ foreach(example_tuple ${sunlinsol_band_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/dense/CMakeLists.txt b/examples/sunlinsol/dense/CMakeLists.txt
@@ -106,7 +106,7 @@ foreach(example_tuple ${sunlinsol_dense_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/klu/CMakeLists.txt b/examples/sunlinsol/klu/CMakeLists.txt
@@ -107,7 +107,7 @@ foreach(example_tuple ${sunlinsol_klu_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/lapackdense/CMakeLists.txt b/examples/sunlinsol/lapackdense/CMakeLists.txt
@@ -112,7 +112,7 @@ foreach(example_tuple ${sunlinsol_lapackdense_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/pcg/serial/CMakeLists.txt b/examples/sunlinsol/pcg/serial/CMakeLists.txt
@@ -113,7 +113,7 @@ foreach(example_tuple ${sunlinsol_pcg_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/spbcgs/serial/CMakeLists.txt b/examples/sunlinsol/spbcgs/serial/CMakeLists.txt
@@ -113,7 +113,7 @@ foreach(example_tuple ${sunlinsol_spbcgs_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/spfgmr/serial/CMakeLists.txt b/examples/sunlinsol/spfgmr/serial/CMakeLists.txt
@@ -112,7 +112,7 @@ foreach(example_tuple ${sunlinsol_spfgmr_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/spgmr/serial/CMakeLists.txt b/examples/sunlinsol/spgmr/serial/CMakeLists.txt
@@ -115,7 +115,7 @@ foreach(example_tuple ${sunlinsol_spgmr_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunlinsol/sptfqmr/serial/CMakeLists.txt b/examples/sunlinsol/sptfqmr/serial/CMakeLists.txt
@@ -113,7 +113,7 @@ foreach(example_tuple ${sunlinsol_sptfqmr_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunmatrix/band/CMakeLists.txt b/examples/sunmatrix/band/CMakeLists.txt
@@ -107,7 +107,7 @@ foreach(example_tuple ${sunmatrix_band_fortran_examples})
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
 
     # set fortran module directory to avoid name collisions
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunmatrix/dense/CMakeLists.txt b/examples/sunmatrix/dense/CMakeLists.txt
@@ -103,7 +103,7 @@ foreach(example_tuple ${sunmatrix_dense_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}

diff --git a/examples/sunmatrix/sparse/CMakeLists.txt b/examples/sunmatrix/sparse/CMakeLists.txt
@@ -108,7 +108,7 @@ foreach(example_tuple ${sunmatrix_sparse_fortran_examples})
 
     # folder to organize targets in an IDE
     set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${example}.dir)
 
     # libraries to link against
     target_link_libraries(${example}