fix build order for fortran modules

LLNL · Feb 17, 2024 · b96f4fa · b96f4fa
1 parent 59d891a
commit b96f4fa
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 27 deletions.
diff --git a/cmake/macros/SundialsAddLibrary.cmake b/cmake/macros/SundialsAddLibrary.cmake
@@ -434,8 +434,8 @@ macro(sundials_add_f2003_library target)
     SOURCES ${sundials_add_f2003_library_SOURCES}
     OBJECT_LIBRARIES ${sundials_add_f2003_library_OBJECT_LIBRARIES}
     LINK_LIBRARIES
-      ${sundials_add_f2003_library_LINK_LIBRARIES}
       PUBLIC ${_clib_name} # depend on the c library
+      ${sundials_add_f2003_library_LINK_LIBRARIES}
     INCLUDE_DIRECTORIES
       ${sundials_add_f2003_library_INCLUDE_DIRECTORIES}
       ${_includes}

diff --git a/src/sunlinsol/band/fmod/CMakeLists.txt b/src/sunlinsol/band/fmod/CMakeLists.txt
@@ -18,10 +18,7 @@ sundials_add_f2003_library(sundials_fsunlinsolband_mod
   SOURCES
     fsunlinsol_band_mod.f90 fsunlinsol_band_mod.c
   LINK_LIBRARIES
-    PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
-  LINK_LIBRARIES
-    PUBLIC sundials_fsunmatrixband_mod
+    PUBLIC sundials_fsunmatrixband_mod sundials_fcore_mod
   OUTPUT_NAME
     sundials_fsunlinsolband_mod
   VERSION

diff --git a/src/sunlinsol/dense/fmod/CMakeLists.txt b/src/sunlinsol/dense/fmod/CMakeLists.txt
@@ -18,10 +18,7 @@ sundials_add_f2003_library(sundials_fsunlinsoldense_mod
   SOURCES
     fsunlinsol_dense_mod.f90 fsunlinsol_dense_mod.c
   LINK_LIBRARIES
-    PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
-  LINK_LIBRARIES
-    PUBLIC sundials_fsunmatrixdense_mod
+    PUBLIC sundials_fsunmatrixdense_mod sundials_fcore_mod
   OUTPUT_NAME
     sundials_fsunlinsoldense_mod
   VERSION

diff --git a/src/sunlinsol/klu/fmod/CMakeLists.txt b/src/sunlinsol/klu/fmod/CMakeLists.txt
@@ -18,10 +18,7 @@ sundials_add_f2003_library(sundials_fsunlinsolklu_mod
   SOURCES
     fsunlinsol_klu_mod.f90 fsunlinsol_klu_mod.c
   LINK_LIBRARIES
-    PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
-  LINK_LIBRARIES
-    PUBLIC sundials_fsunmatrixsparse_mod
+    PUBLIC sundials_fsunmatrixsparse_mod sundials_fcore_mod
   OUTPUT_NAME
     sundials_fsunlinsolklu_mod
   VERSION

diff --git a/src/sunlinsol/lapackdense/fmod/CMakeLists.txt b/src/sunlinsol/lapackdense/fmod/CMakeLists.txt
@@ -19,10 +19,7 @@ sundials_add_f2003_library(sundials_fsunlinsollapackdense_mod
   SOURCES
     fsunlinsol_lapackdense_mod.f90 fsunlinsol_lapackdense_mod.c
   LINK_LIBRARIES
-    PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
-  LINK_LIBRARIES
-    PUBLIC sundials_fsunmatrixdense_mod
+    PUBLIC sundials_fsunmatrixdense_mod sundials_fcore_mod
   OUTPUT_NAME
     sundials_fsunlinsollapackdense_mod
   VERSION

diff --git a/src/sunlinsol/pcg/fmod/CMakeLists.txt b/src/sunlinsol/pcg/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunlinsolpcg_mod
     fsunlinsol_pcg_mod.f90 fsunlinsol_pcg_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunlinsolpcg_mod
   VERSION

diff --git a/src/sunlinsol/spbcgs/fmod/CMakeLists.txt b/src/sunlinsol/spbcgs/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunlinsolspbcgs_mod
     fsunlinsol_spbcgs_mod.f90 fsunlinsol_spbcgs_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunlinsolspbcgs_mod
   VERSION

diff --git a/src/sunlinsol/spfgmr/fmod/CMakeLists.txt b/src/sunlinsol/spfgmr/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunlinsolspfgmr_mod
     fsunlinsol_spfgmr_mod.f90 fsunlinsol_spfgmr_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunlinsolspfgmr_mod
   VERSION

diff --git a/src/sunlinsol/spgmr/fmod/CMakeLists.txt b/src/sunlinsol/spgmr/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunlinsolspgmr_mod
     fsunlinsol_spgmr_mod.f90 fsunlinsol_spgmr_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunlinsolspgmr_mod
   VERSION

diff --git a/src/sunlinsol/sptfqmr/fmod/CMakeLists.txt b/src/sunlinsol/sptfqmr/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunlinsolsptfqmr_mod
     fsunlinsol_sptfqmr_mod.f90 fsunlinsol_sptfqmr_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunlinsolsptfqmr_mod
   VERSION

diff --git a/src/sunmatrix/band/fmod/CMakeLists.txt b/src/sunmatrix/band/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunmatrixband_mod
     fsunmatrix_band_mod.f90 fsunmatrix_band_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunmatrixband_mod
   VERSION

diff --git a/src/sunmatrix/dense/fmod/CMakeLists.txt b/src/sunmatrix/dense/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunmatrixdense_mod
     fsunmatrix_dense_mod.f90 fsunmatrix_dense_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunmatrixdense_mod
   VERSION

diff --git a/src/sunmatrix/sparse/fmod/CMakeLists.txt b/src/sunmatrix/sparse/fmod/CMakeLists.txt
@@ -19,7 +19,6 @@ sundials_add_f2003_library(sundials_fsunmatrixsparse_mod
     fsunmatrix_sparse_mod.f90 fsunmatrix_sparse_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunmatrixsparse_mod
   VERSION

diff --git a/src/sunnonlinsol/fixedpoint/fmod/CMakeLists.txt b/src/sunnonlinsol/fixedpoint/fmod/CMakeLists.txt
@@ -20,7 +20,6 @@ sundials_add_f2003_library(sundials_fsunnonlinsolfixedpoint_mod
     fsunnonlinsol_fixedpoint_mod.f90 fsunnonlinsol_fixedpoint_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunnonlinsolfixedpoint_mod
   VERSION

diff --git a/src/sunnonlinsol/newton/fmod/CMakeLists.txt b/src/sunnonlinsol/newton/fmod/CMakeLists.txt
@@ -20,7 +20,6 @@ sundials_add_f2003_library(sundials_fsunnonlinsolnewton_mod
     fsunnonlinsol_newton_mod.f90 fsunnonlinsol_newton_mod.c
   LINK_LIBRARIES
     PUBLIC sundials_fcore_mod
-  OBJECT_LIBRARIES
   OUTPUT_NAME
     sundials_fsunnonlinsolnewton_mod
   VERSION