diff --git a/cmake/macros/SundialsAddLibrary.cmake b/cmake/macros/SundialsAddLibrary.cmake index 9905ee4668..159690c68e 100644 --- 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 index 250f17c914..8b6e38724e 100644 --- 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 index 61bdf87108..3a1329e120 100644 --- 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 index 4a0323d921..683f76cc3b 100644 --- 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 index 12bcb2fae2..72b9d5acda 100644 --- 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 index 535741e7d6..e863f286ee 100644 --- 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 index d1b588396f..d05fdd7d0c 100644 --- 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 index c2cbd50123..4a236368f8 100644 --- 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 index 9ea74e0e45..005f891f6c 100644 --- 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 index ff3dc41956..2aa92f9022 100644 --- 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 index 465260d783..6026568af8 100644 --- 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 index 987102b9f6..6b11defa31 100644 --- 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 index fb0ed79b4c..407bddff70 100644 --- 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 index bb2f0097b6..6e24d5269c 100644 --- 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 index 46be1ab585..883fac35ed 100644 --- 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