link to core in templates

LLNL · Nov 14, 2023 · 29e5178 · 29e5178
1 parent 6c6462e
commit 29e5178
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 28 deletions.
diff --git a/examples/templates/cmakelists_openmp_C_ex.in b/examples/templates/cmakelists_openmp_C_ex.in
@@ -63,11 +63,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvecopenmp ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_OPENMP library")
@@ -83,6 +85,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_EXTRA_LIBS})

diff --git a/examples/templates/cmakelists_openmpdev_ex.in b/examples/templates/cmakelists_openmpdev_ex.in
@@ -62,11 +62,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvecopenmp ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR OpenMP Device Offloading library")
@@ -82,6 +84,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_EXTRA_LIB})

diff --git a/examples/templates/cmakelists_parallel_CUDA_ex.in b/examples/templates/cmakelists_parallel_CUDA_ex.in
@@ -73,11 +73,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nveccuda ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_CUDA library")
@@ -97,6 +99,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_MPIPLUSX_LIB}

diff --git a/examples/templates/cmakelists_parallel_CXX_ex.in b/examples/templates/cmakelists_parallel_CXX_ex.in
@@ -52,11 +52,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVECPAR_LIB
   sundials_nvecparallel ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_PARALLEL library")
@@ -84,6 +86,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVECPAR_LIB}
   ${SUNDIALS_NVECSER_LIB}

diff --git a/examples/templates/cmakelists_parallel_C_ex.in b/examples/templates/cmakelists_parallel_C_ex.in
@@ -53,11 +53,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVECPAR_LIB
   sundials_nvecparallel ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_PARALLEL library")
@@ -85,6 +87,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVECPAR_LIB}
   ${SUNDIALS_NVECSER_LIB}

diff --git a/examples/templates/cmakelists_parallel_RAJA_ex.in b/examples/templates/cmakelists_parallel_RAJA_ex.in
@@ -73,11 +73,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nveccudaraja ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_RAJA library")
@@ -97,6 +99,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_MPIPLUSX_LIB}

diff --git a/examples/templates/cmakelists_parhyp_CXX_ex.in b/examples/templates/cmakelists_parhyp_CXX_ex.in
@@ -52,11 +52,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvecparallel ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_PARALLEL library")
@@ -76,6 +78,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_NVECPH_LIB}

diff --git a/examples/templates/cmakelists_parhyp_C_ex.in b/examples/templates/cmakelists_parhyp_C_ex.in
@@ -53,11 +53,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvecparhyp ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_PARHYP library")
@@ -73,6 +75,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_EXTRA_LIBS})

diff --git a/examples/templates/cmakelists_pthreads_C_ex.in b/examples/templates/cmakelists_pthreads_C_ex.in
@@ -59,11 +59,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvecpthreads ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_PTHREAD library")
@@ -79,6 +81,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_EXTRA_LIBS})

diff --git a/examples/templates/cmakelists_serial_CUDA_ex.in b/examples/templates/cmakelists_serial_CUDA_ex.in
@@ -77,11 +77,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nveccuda ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_CUDA library")
@@ -116,6 +118,7 @@ set(SUNDIALS_EXTRA_LIBS -L${SUNDIALS_LIBRARY_DIR} @LIBS@ CACHE STRING "Additiona
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_CUSPARSEMAT_LIB}

diff --git a/examples/templates/cmakelists_serial_CXX_ex.in b/examples/templates/cmakelists_serial_CXX_ex.in
@@ -54,6 +54,10 @@ set(SUNDIALS_LIBRARY_DIR
   CACHE PATH "Location of SUNDIALS libraries")
 
 # Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
@@ -77,6 +81,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_MANYVEC_LIB}

diff --git a/examples/templates/cmakelists_serial_C_ex.in b/examples/templates/cmakelists_serial_C_ex.in
@@ -54,11 +54,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvecserial ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_SERIAL library")
@@ -78,6 +80,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_MANYVEC_LIB}

diff --git a/examples/templates/cmakelists_serial_F2003_ex.in b/examples/templates/cmakelists_serial_F2003_ex.in
@@ -54,11 +54,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_SOLVER_FLIB
   @SOLVER_FLIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ Fortran-C library")

diff --git a/examples/templates/cmakelists_serial_RAJA_ex.in b/examples/templates/cmakelists_serial_RAJA_ex.in
@@ -73,11 +73,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nveccudaraja ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_RAJA library")
@@ -93,6 +95,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_EXTRA_LIBS})

diff --git a/examples/templates/cmakelists_trilinos_CXX_ex.in b/examples/templates/cmakelists_trilinos_CXX_ex.in
@@ -65,11 +65,13 @@ set(SUNDIALS_LIBRARY_DIR
   @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
   CACHE PATH "Location of SUNDIALS libraries")
 
-# Find the SUNDIALS libraries
+find_library(SUNDIALS_CORE_LIB
+  sundials_core ${SUNDIALS_LIBRARY_DIR}
+  DOC "SUNDIALS core library")
+
 find_library(SUNDIALS_SOLVER_LIB
   @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
   DOC "@SOLVER@ library")
-
 find_library(SUNDIALS_NVEC_LIB
   sundials_nvectrilinos ${SUNDIALS_LIBRARY_DIR}
   DOC "NVECTOR_TRILINOS library")
@@ -85,6 +87,7 @@ endif()
 # List of SUNDIALS libraries
 set(SUNDIALS_LIBRARIES
   -L${SUNDIALS_LIBRARY_DIR}
+  ${SUNDIALS_CORE_LIB}
   ${SUNDIALS_SOLVER_LIB}
   ${SUNDIALS_NVEC_LIB}
   ${SUNDIALS_EXTRA_LIBS})