[sundials] 02/02: Large patch update. All installed examples build now
Dima Kogan
dima at secretsauce.net
Mon May 22 07:15:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkogan pushed a commit to branch master
in repository sundials.
commit 6092323eaab4e541c55bc19d01520883c665ecc4
Author: Dima Kogan <dima at secretsauce.net>
Date: Sat May 20 20:09:28 2017 -0700
Large patch update. All installed examples build now
---
.../0001-Added-missing-linkages-to-the-DSOs.patch | 135 ++-
.../0002-Fix-library-paths-for-multiarch.patch | 40 +-
...h => 0003-PETSc-is-now-findable-by-CMake.patch} | 62 +-
...4-Examples-use-default-sundials-libraries.patch | 1072 ++++++++++++++++++++
...e-examples-use-default-sundials-libraries.patch | 264 -----
...005-Examples-don-t-call-SUNDIALS_ADD_TEST.patch | 852 ++++++++++++++++
...ode-examples-don-t-call-SUNDIALS_ADD_TEST.patch | 201 ----
debian/patches/0006-Examples-link-with-lm.patch | 540 ++++++++++
...6-example-added-forgotten-library-linkage.patch | 20 -
...penMP-examples-assume-that-we-HAVE-OpenMP.patch | 184 ++++
.../0007-libraries-now-link-with-libklu.patch | 104 --
...es-MPI-examples-use-MPI-compiler-wrappers.patch | 701 +++++++++++++
debian/patches/0008-patched-findPETSc.patch | 74 --
...PRE-examples-build-with-hypre-libraries-a.patch | 70 ++
.../0010-Examples-can-find-the-PETSc-library.patch | 45 +
...ector-examples-use-shipped-copy-of-sundia.patch | 145 +++
...rtran-examples-CMake-knows-to-do-its-fort.patch | 163 +++
...hread-example-assumes-we-have-pthread-sup.patch | 30 +
debian/patches/series | 17 +-
19 files changed, 3982 insertions(+), 737 deletions(-)
diff --git a/debian/patches/0001-Added-missing-linkages-to-the-DSOs.patch b/debian/patches/0001-Added-missing-linkages-to-the-DSOs.patch
index 6d327cf..5dc397e 100644
--- a/debian/patches/0001-Added-missing-linkages-to-the-DSOs.patch
+++ b/debian/patches/0001-Added-missing-linkages-to-the-DSOs.patch
@@ -2,22 +2,36 @@ From: Dima Kogan <dima at secretsauce.net>
Date: Sun, 9 Oct 2016 00:11:22 -0700
Subject: Added missing linkages to the DSOs
+The shared libraries should link against their dependencies
---
- src/arkode/CMakeLists.txt | 2 ++
- src/cvode/CMakeLists.txt | 2 ++
- src/cvodes/CMakeLists.txt | 2 ++
- src/ida/CMakeLists.txt | 2 ++
- src/idas/CMakeLists.txt | 2 ++
- src/kinsol/CMakeLists.txt | 2 ++
- src/nvec_par/CMakeLists.txt | 2 ++
- src/nvec_ser/CMakeLists.txt | 2 ++
- 8 files changed, 16 insertions(+)
+ src/arkode/CMakeLists.txt | 6 ++++++
+ src/cvode/CMakeLists.txt | 6 ++++++
+ src/cvodes/CMakeLists.txt | 6 ++++++
+ src/ida/CMakeLists.txt | 6 ++++++
+ src/idas/CMakeLists.txt | 6 ++++++
+ src/kinsol/CMakeLists.txt | 6 ++++++
+ src/nvec_par/CMakeLists.txt | 2 ++
+ src/nvec_parhyp/CMakeLists.txt | 1 +
+ src/nvec_pthreads/CMakeLists.txt | 1 +
+ src/nvec_ser/CMakeLists.txt | 2 ++
+ 10 files changed, 42 insertions(+)
diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
-index cfed8e6..b76c33b 100644
+index cfed8e6..935502a 100644
--- a/src/arkode/CMakeLists.txt
+++ b/src/arkode/CMakeLists.txt
-@@ -146,6 +146,8 @@ IF(BUILD_SHARED_LIBS)
+@@ -138,6 +138,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_arkode_shared SHARED
+ ${arkode_SOURCES} ${arkode_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_arkode_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # Set the library name and make sure it is not deleted
+ SET_TARGET_PROPERTIES(sundials_arkode_shared
+ PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
+@@ -146,6 +150,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_arkode_shared
PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
@@ -27,10 +41,21 @@ index cfed8e6..b76c33b 100644
INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
diff --git a/src/cvode/CMakeLists.txt b/src/cvode/CMakeLists.txt
-index d47cccc..2ddd2b9 100644
+index d47cccc..be5f857 100644
--- a/src/cvode/CMakeLists.txt
+++ b/src/cvode/CMakeLists.txt
-@@ -153,6 +153,8 @@ IF(BUILD_SHARED_LIBS)
+@@ -145,6 +145,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_cvode_shared SHARED
+ ${cvode_SOURCES} ${cvode_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_cvode_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # Set the library name and make sure it is not deleted
+ SET_TARGET_PROPERTIES(sundials_cvode_shared
+ PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
+@@ -153,6 +157,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_cvode_shared
PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
@@ -40,10 +65,21 @@ index d47cccc..2ddd2b9 100644
INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
diff --git a/src/cvodes/CMakeLists.txt b/src/cvodes/CMakeLists.txt
-index 38229df..8529ff0 100644
+index 38229df..64c04fa 100644
--- a/src/cvodes/CMakeLists.txt
+++ b/src/cvodes/CMakeLists.txt
-@@ -140,6 +140,8 @@ IF(BUILD_SHARED_LIBS)
+@@ -132,6 +132,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_cvodes_shared SHARED
+ ${cvodes_SOURCES} ${cvodes_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # Set the library name and make sure it is not deleted
+ SET_TARGET_PROPERTIES(sundials_cvodes_shared
+ PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
+@@ -140,6 +144,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_cvodes_shared
PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
@@ -53,10 +89,21 @@ index 38229df..8529ff0 100644
INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
diff --git a/src/ida/CMakeLists.txt b/src/ida/CMakeLists.txt
-index 7aa8c84..a7955ad 100644
+index 7aa8c84..9545718 100644
--- a/src/ida/CMakeLists.txt
+++ b/src/ida/CMakeLists.txt
-@@ -143,6 +143,8 @@ IF(BUILD_SHARED_LIBS)
+@@ -135,6 +135,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_ida_shared SHARED
+ ${ida_SOURCES} ${ida_BL_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_ida_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # Set the library name and make sure it is not deleted
+ SET_TARGET_PROPERTIES(sundials_ida_shared
+ PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
+@@ -143,6 +147,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_ida_shared
PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
@@ -66,10 +113,21 @@ index 7aa8c84..a7955ad 100644
INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
diff --git a/src/idas/CMakeLists.txt b/src/idas/CMakeLists.txt
-index 400a228..a89aec8 100644
+index 400a228..535b386 100644
--- a/src/idas/CMakeLists.txt
+++ b/src/idas/CMakeLists.txt
-@@ -145,6 +145,8 @@ IF(BUILD_SHARED_LIBS)
+@@ -137,6 +137,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_idas_shared SHARED
+ ${idas_SOURCES} ${idas_BL_SOURCES} ${idas_SLU_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_idas_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # Set the library name and make sure it is not deleted
+ SET_TARGET_PROPERTIES(sundials_idas_shared
+ PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
+@@ -145,6 +149,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_idas_shared
PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
@@ -79,10 +137,21 @@ index 400a228..a89aec8 100644
INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
diff --git a/src/kinsol/CMakeLists.txt b/src/kinsol/CMakeLists.txt
-index d22ed62..c6cdbf5 100644
+index d22ed62..27b5f4a 100644
--- a/src/kinsol/CMakeLists.txt
+++ b/src/kinsol/CMakeLists.txt
-@@ -153,6 +153,8 @@ IF(BUILD_SHARED_LIBS)
+@@ -145,6 +145,10 @@ IF(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(sundials_kinsol_shared SHARED
+ ${kinsol_SOURCES} ${kinsol_BL_SOURCES} ${kinsol_SLU_SOURCES} ${kinsol_KLU_SOURCES} ${shared_SOURCES})
+
++ IF(KLU_FOUND)
++ TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lklu)
++ ENDIF(KLU_FOUND)
++
+ # Set the library name and make sure it is not deleted
+ SET_TARGET_PROPERTIES(sundials_kinsol_shared
+ PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
+@@ -153,6 +157,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_kinsol_shared
PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
@@ -111,6 +180,30 @@ index 8477fb4..f60b795 100644
INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
ENDIF(BUILD_SHARED_LIBS)
ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
+diff --git a/src/nvec_parhyp/CMakeLists.txt b/src/nvec_parhyp/CMakeLists.txt
+index 9255489..973f2c3 100644
+--- a/src/nvec_parhyp/CMakeLists.txt
++++ b/src/nvec_parhyp/CMakeLists.txt
+@@ -67,6 +67,7 @@ IF(BUILD_SHARED_LIBS)
+ PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
++ TARGET_LINK_LIBRARIES(sundials_nvecparhyp_shared ${HYPRE_LIBRARIES})
+ INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
+ ENDIF(BUILD_SHARED_LIBS)
+
+diff --git a/src/nvec_pthreads/CMakeLists.txt b/src/nvec_pthreads/CMakeLists.txt
+index b711d3a..a476ec0 100644
+--- a/src/nvec_pthreads/CMakeLists.txt
++++ b/src/nvec_pthreads/CMakeLists.txt
+@@ -58,6 +58,7 @@ IF(BUILD_SHARED_LIBS)
+ PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+ SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
+ PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
++ TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lpthread)
+ INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
+ ENDIF(BUILD_SHARED_LIBS)
+
diff --git a/src/nvec_ser/CMakeLists.txt b/src/nvec_ser/CMakeLists.txt
index de9fb12..8b60809 100644
--- a/src/nvec_ser/CMakeLists.txt
diff --git a/debian/patches/0002-Fix-library-paths-for-multiarch.patch b/debian/patches/0002-Fix-library-paths-for-multiarch.patch
index 184e471..b84c74c 100644
--- a/debian/patches/0002-Fix-library-paths-for-multiarch.patch
+++ b/debian/patches/0002-Fix-library-paths-for-multiarch.patch
@@ -47,7 +47,7 @@ index 08b6203..237889c 100644
SET(PACKAGE_BUGREPORT "woodward6 at llnl.gov")
diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
-index b76c33b..4bc9e54 100644
+index 935502a..a92f4f8 100644
--- a/src/arkode/CMakeLists.txt
+++ b/src/arkode/CMakeLists.txt
@@ -127,7 +127,7 @@ IF(BUILD_STATIC_LIBS)
@@ -59,7 +59,7 @@ index b76c33b..4bc9e54 100644
ENDIF(BUILD_STATIC_LIBS)
-@@ -149,7 +149,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -153,7 +153,7 @@ IF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm -llapack -lblas)
# Install the ARKODE library
@@ -82,7 +82,7 @@ index cff9228..108d45a 100644
#
MESSAGE(STATUS "Added ARKODE FCMIX module")
diff --git a/src/cvode/CMakeLists.txt b/src/cvode/CMakeLists.txt
-index 2ddd2b9..0ef4d98 100644
+index be5f857..c6238c9 100644
--- a/src/cvode/CMakeLists.txt
+++ b/src/cvode/CMakeLists.txt
@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
@@ -94,7 +94,7 @@ index 2ddd2b9..0ef4d98 100644
ENDIF(BUILD_STATIC_LIBS)
-@@ -156,7 +156,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -160,7 +160,7 @@ IF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm -llapack -lblas)
# Install the CVODE library
@@ -117,7 +117,7 @@ index 44a82d4..e943c7b 100644
#
MESSAGE(STATUS "Added CVODE FCMIX module")
diff --git a/src/cvodes/CMakeLists.txt b/src/cvodes/CMakeLists.txt
-index 8529ff0..7cc3740 100644
+index 64c04fa..ce734af 100644
--- a/src/cvodes/CMakeLists.txt
+++ b/src/cvodes/CMakeLists.txt
@@ -121,7 +121,7 @@ IF(BUILD_STATIC_LIBS)
@@ -129,7 +129,7 @@ index 8529ff0..7cc3740 100644
ENDIF(BUILD_STATIC_LIBS)
-@@ -143,7 +143,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -147,7 +147,7 @@ IF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm -llapack -lblas)
# Install the CVODES library
@@ -139,7 +139,7 @@ index 8529ff0..7cc3740 100644
ENDIF(BUILD_SHARED_LIBS)
diff --git a/src/ida/CMakeLists.txt b/src/ida/CMakeLists.txt
-index a7955ad..63451cf 100644
+index 9545718..6b4aaa0 100644
--- a/src/ida/CMakeLists.txt
+++ b/src/ida/CMakeLists.txt
@@ -124,7 +124,7 @@ IF(BUILD_STATIC_LIBS)
@@ -151,7 +151,7 @@ index a7955ad..63451cf 100644
ENDIF(BUILD_STATIC_LIBS)
-@@ -146,7 +146,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -150,7 +150,7 @@ IF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(sundials_ida_shared -lm -llapack -lblas)
# Install the IDA library
@@ -173,7 +173,7 @@ index 1a4944b..10450aa 100644
#
MESSAGE(STATUS "Added IDA FCMIX module")
diff --git a/src/idas/CMakeLists.txt b/src/idas/CMakeLists.txt
-index a89aec8..113b188 100644
+index 535b386..231eb9f 100644
--- a/src/idas/CMakeLists.txt
+++ b/src/idas/CMakeLists.txt
@@ -126,7 +126,7 @@ IF(BUILD_STATIC_LIBS)
@@ -185,7 +185,7 @@ index a89aec8..113b188 100644
ENDIF(BUILD_STATIC_LIBS)
-@@ -148,7 +148,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -152,7 +152,7 @@ IF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(sundials_idas_shared -lm -llapack -lblas)
# Install the IDAS library
@@ -195,7 +195,7 @@ index a89aec8..113b188 100644
ENDIF(BUILD_SHARED_LIBS)
diff --git a/src/kinsol/CMakeLists.txt b/src/kinsol/CMakeLists.txt
-index c6cdbf5..e28ad0e 100644
+index 27b5f4a..17fe2e4 100644
--- a/src/kinsol/CMakeLists.txt
+++ b/src/kinsol/CMakeLists.txt
@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
@@ -207,7 +207,7 @@ index c6cdbf5..e28ad0e 100644
ENDIF(BUILD_STATIC_LIBS)
-@@ -156,7 +156,7 @@ IF(BUILD_SHARED_LIBS)
+@@ -160,7 +160,7 @@ IF(BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm -llapack)
# Install the KINSOL library
@@ -310,7 +310,7 @@ index f60b795..3381ed2 100644
ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
#
diff --git a/src/nvec_parhyp/CMakeLists.txt b/src/nvec_parhyp/CMakeLists.txt
-index 9255489..7d1eff6 100644
+index 973f2c3..0a1378e 100644
--- a/src/nvec_parhyp/CMakeLists.txt
+++ b/src/nvec_parhyp/CMakeLists.txt
@@ -53,7 +53,7 @@ IF(BUILD_STATIC_LIBS)
@@ -322,10 +322,10 @@ index 9255489..7d1eff6 100644
ENDIF(BUILD_STATIC_LIBS)
# Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@ IF(BUILD_SHARED_LIBS)
- PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+@@ -68,7 +68,7 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+ TARGET_LINK_LIBRARIES(sundials_nvecparhyp_shared ${HYPRE_LIBRARIES})
- INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
+ INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF(BUILD_SHARED_LIBS)
@@ -354,7 +354,7 @@ index a98867c..52f2b5b 100644
# Install the NVECPARHYP header files
diff --git a/src/nvec_pthreads/CMakeLists.txt b/src/nvec_pthreads/CMakeLists.txt
-index b711d3a..58f08e7 100644
+index a476ec0..a176ff7 100644
--- a/src/nvec_pthreads/CMakeLists.txt
+++ b/src/nvec_pthreads/CMakeLists.txt
@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
@@ -366,16 +366,16 @@ index b711d3a..58f08e7 100644
ENDIF(BUILD_STATIC_LIBS)
# Rules for building and installing the shared library:
-@@ -58,7 +58,7 @@ IF(BUILD_SHARED_LIBS)
- PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+@@ -59,7 +59,7 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+ TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lpthread)
- INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
+ INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF(BUILD_SHARED_LIBS)
# Install the NVECPTHREADS header files
-@@ -71,7 +71,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+@@ -72,7 +72,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
@@ -384,7 +384,7 @@ index b711d3a..58f08e7 100644
ENDIF(BUILD_STATIC_LIBS)
IF(BUILD_SHARED_LIBS)
ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
-@@ -79,7 +79,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+@@ -80,7 +80,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared
PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
diff --git a/debian/patches/0003-Improve-FindPETSc-to-use-pkg-config-where-possible.patch b/debian/patches/0003-PETSc-is-now-findable-by-CMake.patch
similarity index 80%
rename from debian/patches/0003-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
rename to debian/patches/0003-PETSc-is-now-findable-by-CMake.patch
index cfcc85f..1bd6e79 100644
--- a/debian/patches/0003-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
+++ b/debian/patches/0003-PETSc-is-now-findable-by-CMake.patch
@@ -1,12 +1,12 @@
From: James Tocknell <aragilar at gmail.com>
Date: Tue, 14 Feb 2017 21:05:21 +1100
-Subject: Improve FindPETSc to use pkg-config where possible
+Subject: PETSc is now findable by CMake
---
CMakeLists.txt | 14 +++++----
- config/FindPETSc.cmake | 50 +++++++++++++++++--------------
+ config/FindPETSc.cmake | 60 ++++++++++++-------------------------
config/SundialsPETSc.cmake | 75 ----------------------------------------------
- 3 files changed, 35 insertions(+), 104 deletions(-)
+ 3 files changed, 27 insertions(+), 122 deletions(-)
delete mode 100644 config/SundialsPETSc.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,19 +39,33 @@ index 237889c..14bcea6 100644
ENDIF(PETSC_FOUND)
diff --git a/config/FindPETSc.cmake b/config/FindPETSc.cmake
-index 7c1f736..5fb3e56 100644
+index 7c1f736..9ef86e2 100644
--- a/config/FindPETSc.cmake
+++ b/config/FindPETSc.cmake
-@@ -17,32 +17,36 @@
- # Find PETSC library.
- #
-
+@@ -1,48 +1,26 @@
+-# ---------------------------------------------------------------
+-# $Revision: $
+-# $Date: $
+-# ---------------------------------------------------------------
+-# Programmer: Steven Smith @ LLNL
+-# ---------------------------------------------------------------
+-# LLNS Copyright Start
+-# Copyright (c) 2014, Lawrence Livermore National Security
+-# This work was performed under the auspices of the U.S. Department
+-# of Energy by Lawrence Livermore National Laboratory in part under
+-# Contract W-7405-Eng-48 and in part under Contract DE-AC52-07NA27344.
+-# Produced at the Lawrence Livermore National Laboratory.
+-# All rights reserved.
+-# For details, see the LICENSE file.
+-# LLNS Copyright End
+-# ---------------------------------------------------------------
+-# Find PETSC library.
+-#
+find_package(PkgConfig)
-+
+
IF(WIN32)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
endif(WIN32)
-+pkg_check_modules(PC_PETSC QUIET PETSc)
-### Find include dir
-find_path(temp_PETSC_INCLUDE_DIR petsc.h ${PETSC_INCLUDE_DIR})
@@ -59,10 +73,14 @@ index 7c1f736..5fb3e56 100644
- set(PETSC_INCLUDE_DIR ${temp_PETSC_INCLUDE_DIR})
-endif()
-unset(temp_PETSC_INCLUDE_DIR CACHE)
++# Need PETSc and MPI. Linker should be able to find MPI as is
++pkg_check_modules(PC_PETSC REQUIRED PETSc)
+find_path(PETSC_INCLUDE_DIR petsc.h
+ HINTS ${PC_PETSC_INCLUDEDIR} ${PC_PETSC_INCLUDE_DIRS}
+ PATHS PETSC_INCLUDE_DIR
+ )
++find_library(PETSC_LIBRARY NAMES petsc
++ HINTS ${PC_PETSC_LIBDIR} ${PC_PETSC_LIBRARY_DIRS} )
-if (PETSC_LIBRARY)
- # We have (or were given) PETSC_LIBRARY - get path to use for any related libs
@@ -80,28 +98,18 @@ index 7c1f736..5fb3e56 100644
- )
-endif ()
-mark_as_advanced(PETSC_LIBRARY)
-+find_library(PETSC_LIBRARY NAMES petsc
-+ HINTS ${PC_PETSC_LIBDIR} ${PC_PETSC_LIBRARY_DIRS} )
++pkg_check_modules(PC_MPI REQUIRED ompi-c)
++find_path(MPI_INCLUDE_DIR mpi.h
++ HINTS ${PC_MPI_INCLUDEDIR} ${PC_MPI_INCLUDE_DIRS}
++ PATHS MPI_INCLUDE_DIR
++ )
-set(PETSC_LIBRARIES ${PETSC_LIBRARY})
-+include(CheckCSourceRuns)
-+set(CMAKE_REQUIRED_INCLUDES ${PETSC_INCLUDE_DIR})
-+set(CMAKE_REQUIRED_LIBRARIES ${PETSC_LIBRARY})
-+check_c_source_runs(
-+ "\#include \"petscvec.h\"\nint main(){Vec x;VecCreate(PETSC_COMM_WORLD, &x);return(0);}"
-+ PETSC_BUILD_STATUS
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+# handle the QUIETLY and REQUIRED arguments and set PETSC_FOUND to TRUE
-+# if all listed variables are TRUE
-+find_package_handle_standard_args(PETSc DEFAULT_MSG
-+ PETSC_LIBRARY PETSC_INCLUDE_DIR PETSC_BUILD_STATUS)
-+
+mark_as_advanced(PETSC_INCLUDE_DIR PETSC_LIBRARY )
+
+set(PETSC_LIBRARIES ${PETSC_LIBRARY} )
-+set(PETSC_INCLUDE_DIRS ${PETSC_INCLUDE_DIR} )
++set(PETSC_INCLUDE_DIRS ${PC_PETSC_INCLUDE_DIRS} ${MPI_INCLUDE_DIR})
++set(PETSC_FOUND TRUE)
diff --git a/config/SundialsPETSc.cmake b/config/SundialsPETSc.cmake
deleted file mode 100644
index 4ab8f49..0000000
diff --git a/debian/patches/0004-Examples-use-default-sundials-libraries.patch b/debian/patches/0004-Examples-use-default-sundials-libraries.patch
new file mode 100644
index 0000000..cffe7d2
--- /dev/null
+++ b/debian/patches/0004-Examples-use-default-sundials-libraries.patch
@@ -0,0 +1,1072 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 2 Apr 2017 19:27:22 -0700
+Subject: Examples: use default sundials libraries
+
+Examples should be buildable from /usr/share/doc/libsundials-something. The
+CMakeLists files are written to build them at BUILD time, but I want to already
+assume that the packages are installed and use those
+
+We now use the default libraries, which (when the packages are installed) are
+the shared libraries. The CMakeLists files were instead referring to ..._shared
+or ..._static, which doesn't refer to any installed-time files
+---
+ examples/arkode/CXX_parallel/CMakeLists.txt | 12 ++----------
+ examples/arkode/CXX_serial/CMakeLists.txt | 12 ++----------
+ examples/arkode/C_openmp/CMakeLists.txt | 12 ++----------
+ examples/arkode/C_parallel/CMakeLists.txt | 11 ++---------
+ examples/arkode/C_parhyp/CMakeLists.txt | 11 ++---------
+ examples/arkode/C_serial/CMakeLists.txt | 12 ++----------
+ examples/arkode/F77_parallel/CMakeLists.txt | 19 ++++---------------
+ examples/arkode/F77_serial/CMakeLists.txt | 19 ++++---------------
+ examples/arkode/F90_parallel/CMakeLists.txt | 17 ++++-------------
+ examples/arkode/F90_serial/CMakeLists.txt | 19 ++++---------------
+ examples/cvode/C_openmp/CMakeLists.txt | 12 ++----------
+ examples/cvode/fcmix_parallel/CMakeLists.txt | 17 ++++-------------
+ examples/cvode/fcmix_serial/CMakeLists.txt | 17 ++++-------------
+ examples/cvode/parallel/CMakeLists.txt | 12 ++----------
+ examples/cvode/parhyp/CMakeLists.txt | 12 ++----------
+ examples/cvode/serial/CMakeLists.txt | 12 ++----------
+ examples/cvodes/C_openmp/CMakeLists.txt | 12 ++----------
+ examples/cvodes/parallel/CMakeLists.txt | 12 ++----------
+ examples/cvodes/serial/CMakeLists.txt | 12 ++----------
+ examples/ida/C_openmp/CMakeLists.txt | 12 ++----------
+ examples/ida/fcmix_openmp/CMakeLists.txt | 17 ++++-------------
+ examples/ida/fcmix_parallel/CMakeLists.txt | 17 ++++-------------
+ examples/ida/fcmix_pthreads/CMakeLists.txt | 17 ++++-------------
+ examples/ida/fcmix_serial/CMakeLists.txt | 17 ++++-------------
+ examples/ida/parallel/CMakeLists.txt | 12 ++----------
+ examples/ida/petsc/CMakeLists.txt | 12 ++----------
+ examples/ida/serial/CMakeLists.txt | 12 ++----------
+ examples/idas/C_openmp/CMakeLists.txt | 12 ++----------
+ examples/idas/parallel/CMakeLists.txt | 12 ++----------
+ examples/idas/serial/CMakeLists.txt | 12 ++----------
+ examples/kinsol/C_openmp/CMakeLists.txt | 12 ++----------
+ examples/kinsol/fcmix_parallel/CMakeLists.txt | 17 ++++-------------
+ examples/kinsol/fcmix_serial/CMakeLists.txt | 17 ++++-------------
+ examples/kinsol/parallel/CMakeLists.txt | 12 ++----------
+ examples/kinsol/serial/CMakeLists.txt | 12 ++----------
+ examples/nvector/C_openmp/CMakeLists.txt | 9 +--------
+ examples/nvector/parallel/CMakeLists.txt | 9 +--------
+ examples/nvector/parhyp/CMakeLists.txt | 8 +-------
+ examples/nvector/petsc/CMakeLists.txt | 9 +--------
+ examples/nvector/pthreads/CMakeLists.txt | 9 +--------
+ examples/nvector/serial/CMakeLists.txt | 9 +--------
+ 41 files changed, 100 insertions(+), 437 deletions(-)
+
+diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt
+index 8f51139..894edec 100644
+--- a/examples/arkode/CXX_parallel/CMakeLists.txt
++++ b/examples/arkode/CXX_parallel/CMakeLists.txt
+@@ -46,16 +46,8 @@ ELSE(MPI_MPICXX)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICXX)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/arkode/CXX_serial/CMakeLists.txt b/examples/arkode/CXX_serial/CMakeLists.txt
+index 8ebc0f3..d64dd81 100644
+--- a/examples/arkode/CXX_serial/CMakeLists.txt
++++ b/examples/arkode/CXX_serial/CMakeLists.txt
+@@ -38,16 +38,8 @@ SET(ARKODE_extras
+ plot_sol.py
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
+index 788f249..ccc55f1 100644
+--- a/examples/arkode/C_openmp/CMakeLists.txt
++++ b/examples/arkode/C_openmp/CMakeLists.txt
+@@ -35,16 +35,8 @@ SET(ARKODE_extras_OMP
+
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECOMP_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECOMP_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECOMP_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECOMP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/arkode/C_parallel/CMakeLists.txt b/examples/arkode/C_parallel/CMakeLists.txt
+index 6d866f4..9e61de0 100644
+--- a/examples/arkode/C_parallel/CMakeLists.txt
++++ b/examples/arkode/C_parallel/CMakeLists.txt
+@@ -44,15 +44,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
+index b34b640..b224b84 100644
+--- a/examples/arkode/C_parhyp/CMakeLists.txt
++++ b/examples/arkode/C_parhyp/CMakeLists.txt
+@@ -44,15 +44,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECP_LIB sundials_nvecparhyp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECP_LIB sundials_nvecparhyp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECP_LIB sundials_nvecparhyp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
+index 97c3027..3985a4f 100644
+--- a/examples/arkode/C_serial/CMakeLists.txt
++++ b/examples/arkode/C_serial/CMakeLists.txt
+@@ -66,16 +66,8 @@ SET(ARKODE_extras
+ plot_sol_log.py
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
+index 5454a4f..19bda13 100644
+--- a/examples/arkode/F77_parallel/CMakeLists.txt
++++ b/examples/arkode/F77_parallel/CMakeLists.txt
+@@ -45,22 +45,11 @@ ELSE(MPI_MPIF77)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPIF77)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECP_LIB sundials_nvecparallel)
++SET(FNVECP_LIB sundials_fnvecparallel)
+
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+- SET(FNVECP_LIB sundials_fnvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+- SET(FNVECP_LIB sundials_fnvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
+-
+-# Only static FCMIX libraries are available
+-
+-SET(FARKODE_LIB sundials_farkode_static)
++SET(FARKODE_LIB sundials_farkode)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
+index 7a9c40e..f582b6e 100644
+--- a/examples/arkode/F77_serial/CMakeLists.txt
++++ b/examples/arkode/F77_serial/CMakeLists.txt
+@@ -39,22 +39,11 @@ SET(FARKODE_examples_BL
+ SET(ARKODE_extras
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECS_LIB sundials_nvecserial)
++SET(FNVECS_LIB sundials_fnvecserial)
+
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+- SET(FNVECS_LIB sundials_fnvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+- SET(FNVECS_LIB sundials_fnvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
+-
+-# Only static FCMIX libraries are available
+-
+-SET(FARKODE_LIB sundials_farkode_static)
++SET(FARKODE_LIB sundials_farkode)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
+index fca2903..72d9910 100644
+--- a/examples/arkode/F90_parallel/CMakeLists.txt
++++ b/examples/arkode/F90_parallel/CMakeLists.txt
+@@ -44,20 +44,11 @@ ELSE(MPI_MPIF90)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPIF90)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+- SET(FNVECP_LIB sundials_fnvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+- SET(FNVECP_LIB sundials_fnvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECP_LIB sundials_nvecparallel)
++SET(FNVECP_LIB sundials_fnvecparallel)
+
+-# Only static FCMIX libraries are available
+-SET(FARKODE_LIB sundials_farkode_static)
++SET(FARKODE_LIB sundials_farkode)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${FARKODE_LIB} ${ARKODE_LIB} ${FNVECP_LIB} ${NVECP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
+index 62e01db..450551f 100644
+--- a/examples/arkode/F90_serial/CMakeLists.txt
++++ b/examples/arkode/F90_serial/CMakeLists.txt
+@@ -47,22 +47,11 @@ SET(ARKODE_extras
+ plot_brusselator1D_FEM.py
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
++SET(ARKODE_LIB sundials_arkode)
++SET(NVECS_LIB sundials_nvecserial)
++SET(FNVECS_LIB sundials_fnvecserial)
+
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+- SET(FNVECS_LIB sundials_fnvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(ARKODE_LIB sundials_arkode_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+- SET(FNVECS_LIB sundials_fnvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
+-
+-# Only static FCMIX libraries are available
+-
+-SET(FARKODE_LIB sundials_farkode_static)
++SET(FARKODE_LIB sundials_farkode)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvode/C_openmp/CMakeLists.txt b/examples/cvode/C_openmp/CMakeLists.txt
+index ba4e164..2b2cf84 100644
+--- a/examples/cvode/C_openmp/CMakeLists.txt
++++ b/examples/cvode/C_openmp/CMakeLists.txt
+@@ -30,16 +30,8 @@ SET(CVODE_examples_OMP
+
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_static)
+- SET(NVECOMP_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_shared)
+- SET(NVECOMP_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODE_LIB sundials_cvode)
++SET(NVECOMP_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${CVODE_LIB} ${NVECOMP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/cvode/fcmix_parallel/CMakeLists.txt b/examples/cvode/fcmix_parallel/CMakeLists.txt
+index a7f83d6..c134e05 100644
+--- a/examples/cvode/fcmix_parallel/CMakeLists.txt
++++ b/examples/cvode/fcmix_parallel/CMakeLists.txt
+@@ -37,22 +37,13 @@ ELSE(MPI_MPIF77)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPIF77)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+- SET(FNVECP_LIB sundials_fnvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+- SET(FNVECP_LIB sundials_fnvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODE_LIB sundials_cvode)
++SET(NVECP_LIB sundials_nvecparallel)
++SET(FNVECP_LIB sundials_fnvecparallel)
+
+ # Only static FCMIX libraries are available
+
+-SET(FCVODE_LIB sundials_fcvode_static)
++SET(FCVODE_LIB sundials_fcvode)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvode/fcmix_serial/CMakeLists.txt b/examples/cvode/fcmix_serial/CMakeLists.txt
+index cde8e0a..fa5265c 100644
+--- a/examples/cvode/fcmix_serial/CMakeLists.txt
++++ b/examples/cvode/fcmix_serial/CMakeLists.txt
+@@ -41,22 +41,13 @@ SET(FCVODE_examples_BL
+ fcvRoberts_dnsL
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+- SET(FNVECS_LIB sundials_fnvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+- SET(FNVECS_LIB sundials_fnvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODE_LIB sundials_cvode)
++SET(NVECS_LIB sundials_nvecserial)
++SET(FNVECS_LIB sundials_fnvecserial)
+
+ # Only static FCMIX libraries are available
+
+-SET(FCVODE_LIB sundials_fcvode_static)
++SET(FCVODE_LIB sundials_fcvode)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvode/parallel/CMakeLists.txt b/examples/cvode/parallel/CMakeLists.txt
+index b44b707..e8a61a7 100644
+--- a/examples/cvode/parallel/CMakeLists.txt
++++ b/examples/cvode/parallel/CMakeLists.txt
+@@ -38,16 +38,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODE_LIB sundials_cvode)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvode/parhyp/CMakeLists.txt b/examples/cvode/parhyp/CMakeLists.txt
+index a07c51c..3970601 100644
+--- a/examples/cvode/parhyp/CMakeLists.txt
++++ b/examples/cvode/parhyp/CMakeLists.txt
+@@ -37,16 +37,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_static)
+- SET(NVECP_LIB sundials_nvecparhyp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_shared)
+- SET(NVECP_LIB sundials_nvecparhyp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODE_LIB sundials_cvode)
++SET(NVECP_LIB sundials_nvecparhyp)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvode/serial/CMakeLists.txt b/examples/cvode/serial/CMakeLists.txt
+index 1e04c45..15b4e67 100644
+--- a/examples/cvode/serial/CMakeLists.txt
++++ b/examples/cvode/serial/CMakeLists.txt
+@@ -45,16 +45,8 @@ SET(CVODE_examples_BL
+ cvRoberts_dnsL
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODE_LIB sundials_cvode_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODE_LIB sundials_cvode)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvodes/C_openmp/CMakeLists.txt b/examples/cvodes/C_openmp/CMakeLists.txt
+index 6c0c90e..94db899 100644
+--- a/examples/cvodes/C_openmp/CMakeLists.txt
++++ b/examples/cvodes/C_openmp/CMakeLists.txt
+@@ -30,16 +30,8 @@ SET(CVODES_examples_OMP
+
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODES_LIB sundials_cvodes_static)
+- SET(NVECOMP_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODES_LIB sundials_cvodes_shared)
+- SET(NVECOMP_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODES_LIB sundials_cvodes)
++SET(NVECOMP_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${CVODES_LIB} ${NVECOMP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/cvodes/parallel/CMakeLists.txt b/examples/cvodes/parallel/CMakeLists.txt
+index 78ea644..36c38cf 100644
+--- a/examples/cvodes/parallel/CMakeLists.txt
++++ b/examples/cvodes/parallel/CMakeLists.txt
+@@ -43,16 +43,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODES_LIB sundials_cvodes_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODES_LIB sundials_cvodes_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODES_LIB sundials_cvodes)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/cvodes/serial/CMakeLists.txt b/examples/cvodes/serial/CMakeLists.txt
+index ea409c7..38f9e05 100644
+--- a/examples/cvodes/serial/CMakeLists.txt
++++ b/examples/cvodes/serial/CMakeLists.txt
+@@ -59,16 +59,8 @@ SET(CVODES_examples_SUPERLUMT
+ "cvsRoberts_FSA_sps\;-sensi stg1 t"
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODES_LIB sundials_cvodes_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(CVODES_LIB sundials_cvodes_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(CVODES_LIB sundials_cvodes)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/C_openmp/CMakeLists.txt b/examples/ida/C_openmp/CMakeLists.txt
+index 2ed6996..c381b82 100644
+--- a/examples/ida/C_openmp/CMakeLists.txt
++++ b/examples/ida/C_openmp/CMakeLists.txt
+@@ -29,16 +29,8 @@ IF(OPENMP_FOUND)
+ )
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECS_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECS_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECS_LIB sundials_nvecopenmp)
+
+
+ # Set-up linker flags and link libraries
+diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
+index 92c4829..0cca839 100644
+--- a/examples/ida/fcmix_openmp/CMakeLists.txt
++++ b/examples/ida/fcmix_openmp/CMakeLists.txt
+@@ -32,22 +32,13 @@ SET(FIDA_examples_BL
+ )
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECS_LIB sundials_nvecopenmp_static)
+- SET(FNVECS_LIB sundials_fnvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECS_LIB sundials_nvecopenmp_shared)
+- SET(FNVECS_LIB sundials_fnvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECS_LIB sundials_nvecopenmp)
++SET(FNVECS_LIB sundials_fnvecopenmp)
+
+ # Only static FCMIX libraries are available
+
+-SET(FIDA_LIB sundials_fida_static)
++SET(FIDA_LIB sundials_fida)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/fcmix_parallel/CMakeLists.txt b/examples/ida/fcmix_parallel/CMakeLists.txt
+index e3104a8..f812ba8 100644
+--- a/examples/ida/fcmix_parallel/CMakeLists.txt
++++ b/examples/ida/fcmix_parallel/CMakeLists.txt
+@@ -35,22 +35,13 @@ ELSE(MPI_MPIF77)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPIF77)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+- SET(FNVECP_LIB sundials_fnvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+- SET(FNVECP_LIB sundials_fnvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECP_LIB sundials_nvecparallel)
++SET(FNVECP_LIB sundials_fnvecparallel)
+
+ # Only static FCMIX libraries are available
+
+-SET(FIDA_LIB sundials_fida_static)
++SET(FIDA_LIB sundials_fida)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
+index 93a5696..f3bf5cf 100644
+--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
++++ b/examples/ida/fcmix_pthreads/CMakeLists.txt
+@@ -32,22 +32,13 @@ SET(FIDA_examples_BL
+ )
+ ENDIF(PTHREADS_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECS_LIB sundials_nvecpthreads_static)
+- SET(FNVECS_LIB sundials_fnvecpthreads_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECS_LIB sundials_nvecpthreads_shared)
+- SET(FNVECS_LIB sundials_fnvecpthreads_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECS_LIB sundials_nvecpthreads)
++SET(FNVECS_LIB sundials_fnvecpthreads)
+
+ # Only static FCMIX libraries are available
+
+-SET(FIDA_LIB sundials_fida_static)
++SET(FIDA_LIB sundials_fida)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/fcmix_serial/CMakeLists.txt b/examples/ida/fcmix_serial/CMakeLists.txt
+index 69d381e..b9d72be 100644
+--- a/examples/ida/fcmix_serial/CMakeLists.txt
++++ b/examples/ida/fcmix_serial/CMakeLists.txt
+@@ -29,22 +29,13 @@ SET(FIDA_examples
+ SET(FIDA_examples_BL
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+- SET(FNVECS_LIB sundials_fnvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+- SET(FNVECS_LIB sundials_fnvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECS_LIB sundials_nvecserial)
++SET(FNVECS_LIB sundials_fnvecserial)
+
+ # Only static FCMIX libraries are available
+
+-SET(FIDA_LIB sundials_fida_static)
++SET(FIDA_LIB sundials_fida)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/parallel/CMakeLists.txt b/examples/ida/parallel/CMakeLists.txt
+index 21b1e14..1e18aef 100644
+--- a/examples/ida/parallel/CMakeLists.txt
++++ b/examples/ida/parallel/CMakeLists.txt
+@@ -38,16 +38,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/petsc/CMakeLists.txt b/examples/ida/petsc/CMakeLists.txt
+index 52e3a84..bbf5b57 100644
+--- a/examples/ida/petsc/CMakeLists.txt
++++ b/examples/ida/petsc/CMakeLists.txt
+@@ -36,16 +36,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECP_LIB sundials_nvecpetsc_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECP_LIB sundials_nvecpetsc_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECP_LIB sundials_nvecpetsc)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/ida/serial/CMakeLists.txt b/examples/ida/serial/CMakeLists.txt
+index c0b73ad..5623f3f 100644
+--- a/examples/ida/serial/CMakeLists.txt
++++ b/examples/ida/serial/CMakeLists.txt
+@@ -48,16 +48,8 @@ SET(IDA_examples_KLU
+ SET(IDA_examples_BL
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDA_LIB sundials_ida_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDA_LIB sundials_ida)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/idas/C_openmp/CMakeLists.txt b/examples/idas/C_openmp/CMakeLists.txt
+index 845504e..cf227bf 100644
+--- a/examples/idas/C_openmp/CMakeLists.txt
++++ b/examples/idas/C_openmp/CMakeLists.txt
+@@ -29,16 +29,8 @@ IF(OPENMP_FOUND)
+ )
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDAS_LIB sundials_idas_static)
+- SET(NVECOMP_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDAS_LIB sundials_idas_shared)
+- SET(NVECOMP_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDAS_LIB sundials_idas)
++SET(NVECOMP_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${IDAS_LIB} ${NVECOMP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/idas/parallel/CMakeLists.txt b/examples/idas/parallel/CMakeLists.txt
+index 24978c8..7a859ca 100644
+--- a/examples/idas/parallel/CMakeLists.txt
++++ b/examples/idas/parallel/CMakeLists.txt
+@@ -43,16 +43,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDAS_LIB sundials_idas_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDAS_LIB sundials_idas_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDAS_LIB sundials_idas)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/idas/serial/CMakeLists.txt b/examples/idas/serial/CMakeLists.txt
+index 267bfd7..b888951 100644
+--- a/examples/idas/serial/CMakeLists.txt
++++ b/examples/idas/serial/CMakeLists.txt
+@@ -55,16 +55,8 @@ SET(IDAS_examples_KLU
+ "idasRoberts_FSA_klu\;-sensi stg t"
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDAS_LIB sundials_idas_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(IDAS_LIB sundials_idas_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(IDAS_LIB sundials_idas)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/kinsol/C_openmp/CMakeLists.txt b/examples/kinsol/C_openmp/CMakeLists.txt
+index 06c937f..a2fd0b8 100644
+--- a/examples/kinsol/C_openmp/CMakeLists.txt
++++ b/examples/kinsol/C_openmp/CMakeLists.txt
+@@ -30,16 +30,8 @@ SET(KINSOL_examples_OMP
+
+ ENDIF(OPENMP_FOUND)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_static)
+- SET(NVECOMP_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_shared)
+- SET(NVECOMP_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(KINSOL_LIB sundials_kinsol)
++SET(NVECOMP_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${KINSOL_LIB} ${NVECOMP_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/kinsol/fcmix_parallel/CMakeLists.txt b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+index d3f5d60..ef11835 100644
+--- a/examples/kinsol/fcmix_parallel/CMakeLists.txt
++++ b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+@@ -35,22 +35,13 @@ ELSE(MPI_MPIF77)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPIF77)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+- SET(FNVECP_LIB sundials_fnvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+- SET(FNVECP_LIB sundials_fnvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(KINSOL_LIB sundials_kinsol)
++SET(NVECP_LIB sundials_nvecparallel)
++SET(FNVECP_LIB sundials_fnvecparallel)
+
+ # Only static FCMIX libraries are available
+
+-SET(FKINSOL_LIB sundials_fkinsol_static)
++SET(FKINSOL_LIB sundials_fkinsol)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/kinsol/fcmix_serial/CMakeLists.txt b/examples/kinsol/fcmix_serial/CMakeLists.txt
+index d739119..a1afa2e 100644
+--- a/examples/kinsol/fcmix_serial/CMakeLists.txt
++++ b/examples/kinsol/fcmix_serial/CMakeLists.txt
+@@ -29,22 +29,13 @@ SET(FKINSOL_examples
+ SET(FKINSOL_examples_BL
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+- SET(FNVECS_LIB sundials_fnvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+- SET(FNVECS_LIB sundials_fnvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(KINSOL_LIB sundials_kinsol)
++SET(NVECS_LIB sundials_nvecserial)
++SET(FNVECS_LIB sundials_fnvecserial)
+
+ # Only static FCMIX libraries are available
+
+-SET(FKINSOL_LIB sundials_fkinsol_static)
++SET(FKINSOL_LIB sundials_fkinsol)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/kinsol/parallel/CMakeLists.txt b/examples/kinsol/parallel/CMakeLists.txt
+index 4a08d8f..a829ca9 100644
+--- a/examples/kinsol/parallel/CMakeLists.txt
++++ b/examples/kinsol/parallel/CMakeLists.txt
+@@ -36,16 +36,8 @@ ELSE(MPI_MPICC)
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ ENDIF(MPI_MPICC)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_static)
+- SET(NVECP_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_shared)
+- SET(NVECP_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(KINSOL_LIB sundials_kinsol)
++SET(NVECP_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/kinsol/serial/CMakeLists.txt b/examples/kinsol/serial/CMakeLists.txt
+index 1c0a39e..6ed3293 100644
+--- a/examples/kinsol/serial/CMakeLists.txt
++++ b/examples/kinsol/serial/CMakeLists.txt
+@@ -43,16 +43,8 @@ SET(KINSOL_examples_KLU
+ kinFerTron_klu
+ )
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_static)
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(KINSOL_LIB sundials_kinsol_shared)
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(KINSOL_LIB sundials_kinsol)
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
+index 9fca937..7641a16 100644
+--- a/examples/nvector/C_openmp/CMakeLists.txt
++++ b/examples/nvector/C_openmp/CMakeLists.txt
+@@ -30,14 +30,7 @@ SET(nvector_examples_dependencies
+ # Add source directory to include directories
+ INCLUDE_DIRECTORIES(. ..)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecopenmp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecopenmp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(NVECS_LIB sundials_nvecopenmp)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/nvector/parallel/CMakeLists.txt b/examples/nvector/parallel/CMakeLists.txt
+index 4f37514..1ac0832 100644
+--- a/examples/nvector/parallel/CMakeLists.txt
++++ b/examples/nvector/parallel/CMakeLists.txt
+@@ -30,14 +30,7 @@ SET(nvector_examples_dependencies
+ # Add source directory to include directories
+ INCLUDE_DIRECTORIES(. ..)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecparallel_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecparallel_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(NVECS_LIB sundials_nvecparallel)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
+index ad687bb..95b58fe 100644
+--- a/examples/nvector/parhyp/CMakeLists.txt
++++ b/examples/nvector/parhyp/CMakeLists.txt
+@@ -33,14 +33,8 @@ INCLUDE_DIRECTORIES(${HYPRE_INC_PATH})
+ INCLUDE_DIRECTORIES(${HYPRE_INC_DIR})
+ INCLUDE_DIRECTORIES(${HYPRE_LIB_DIR})
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecparhyp_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecparhyp_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(NVECS_LIB sundials_nvecparhyp)
+
+ # Set-up linker flags and link libraries
+ SET(SUNDIALS_LIBS ${NVECS_LIB} ${EXTRA_LINK_LIBS})
+diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
+index 2ced736..b5cfc1d 100644
+--- a/examples/nvector/petsc/CMakeLists.txt
++++ b/examples/nvector/petsc/CMakeLists.txt
+@@ -31,14 +31,7 @@ SET(nvector_examples_dependencies
+ INCLUDE_DIRECTORIES(. ..)
+ INCLUDE_DIRECTORIES(${PETSC_INCLUDE_DIR})
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecpetsc_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecpetsc_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(NVECS_LIB sundials_nvecpetsc)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
+index 946d0d3..d756f8c 100644
+--- a/examples/nvector/pthreads/CMakeLists.txt
++++ b/examples/nvector/pthreads/CMakeLists.txt
+@@ -30,14 +30,7 @@ SET(nvector_examples_dependencies
+ # Add source directory to include directories
+ INCLUDE_DIRECTORIES(. ..)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecpthreads_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecpthreads_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(NVECS_LIB sundials_nvecpthreads)
+
+ # Set-up linker flags and link libraries
+
+diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
+index 9c38a10..7605067 100644
+--- a/examples/nvector/serial/CMakeLists.txt
++++ b/examples/nvector/serial/CMakeLists.txt
+@@ -30,14 +30,7 @@ SET(nvector_examples_dependencies
+ # Add source directory to include directories
+ INCLUDE_DIRECTORIES(. ..)
+
+-# Specify libraries to link against (through the target that was used to
+-# generate them) based on the value of the variable LINK_LIBRARY_TYPE
+-
+-IF(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecserial_static)
+-ELSE(LINK_LIBRARY_TYPE MATCHES "static")
+- SET(NVECS_LIB sundials_nvecserial_shared)
+-ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
++SET(NVECS_LIB sundials_nvecserial)
+
+ # Set-up linker flags and link libraries
+
diff --git a/debian/patches/0004-arkode-examples-use-default-sundials-libraries.patch b/debian/patches/0004-arkode-examples-use-default-sundials-libraries.patch
deleted file mode 100644
index c1c17a1..0000000
--- a/debian/patches/0004-arkode-examples-use-default-sundials-libraries.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 2 Apr 2017 19:27:22 -0700
-Subject: arkode examples: use default sundials libraries
-
-This should be applied to ALL examples. These examples should be buildable from
-/usr/share/doc/libsundials-something. The CMakeLists files are written to build
-them at BUILD time, but I want to already assume that the packages are installed
-and use those
-
-We now use the default libraries, which (when the packages are installed) are
-the shared libraries. The CMakeLists files were instead referring to ..._shared
-or ..._static, which doesn't refer to any installed-time files
----
- examples/arkode/CXX_parallel/CMakeLists.txt | 12 ++----------
- examples/arkode/CXX_serial/CMakeLists.txt | 12 ++----------
- examples/arkode/C_openmp/CMakeLists.txt | 12 ++----------
- examples/arkode/C_parallel/CMakeLists.txt | 11 ++---------
- examples/arkode/C_parhyp/CMakeLists.txt | 11 ++---------
- examples/arkode/C_serial/CMakeLists.txt | 12 ++----------
- examples/arkode/F77_parallel/CMakeLists.txt | 15 +++------------
- examples/arkode/F77_serial/CMakeLists.txt | 15 +++------------
- examples/arkode/F90_parallel/CMakeLists.txt | 14 +++-----------
- examples/arkode/F90_serial/CMakeLists.txt | 15 +++------------
- 10 files changed, 24 insertions(+), 105 deletions(-)
-
-diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt
-index 8f51139..894edec 100644
---- a/examples/arkode/CXX_parallel/CMakeLists.txt
-+++ b/examples/arkode/CXX_parallel/CMakeLists.txt
-@@ -46,16 +46,8 @@ ELSE(MPI_MPICXX)
- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
- ENDIF(MPI_MPICXX)
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECP_LIB sundials_nvecparallel_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECP_LIB sundials_nvecparallel_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECP_LIB sundials_nvecparallel)
-
- # Set-up linker flags and link libraries
-
-diff --git a/examples/arkode/CXX_serial/CMakeLists.txt b/examples/arkode/CXX_serial/CMakeLists.txt
-index 8ebc0f3..d64dd81 100644
---- a/examples/arkode/CXX_serial/CMakeLists.txt
-+++ b/examples/arkode/CXX_serial/CMakeLists.txt
-@@ -38,16 +38,8 @@ SET(ARKODE_extras
- plot_sol.py
- )
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECS_LIB sundials_nvecserial_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECS_LIB sundials_nvecserial_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECS_LIB sundials_nvecserial)
-
- # Set-up linker flags and link libraries
-
-diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
-index 788f249..ccc55f1 100644
---- a/examples/arkode/C_openmp/CMakeLists.txt
-+++ b/examples/arkode/C_openmp/CMakeLists.txt
-@@ -35,16 +35,8 @@ SET(ARKODE_extras_OMP
-
- ENDIF(OPENMP_FOUND)
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECOMP_LIB sundials_nvecopenmp_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECOMP_LIB sundials_nvecopenmp_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECOMP_LIB sundials_nvecopenmp)
-
- # Set-up linker flags and link libraries
- SET(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECOMP_LIB} ${EXTRA_LINK_LIBS})
-diff --git a/examples/arkode/C_parallel/CMakeLists.txt b/examples/arkode/C_parallel/CMakeLists.txt
-index 6d866f4..9e61de0 100644
---- a/examples/arkode/C_parallel/CMakeLists.txt
-+++ b/examples/arkode/C_parallel/CMakeLists.txt
-@@ -44,15 +44,8 @@ ELSE(MPI_MPICC)
- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
- ENDIF(MPI_MPICC)
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECP_LIB sundials_nvecparallel_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECP_LIB sundials_nvecparallel_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECP_LIB sundials_nvecparallel)
-
- # Set-up linker flags and link libraries
- SET(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECP_LIB} ${EXTRA_LINK_LIBS})
-diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
-index b34b640..b224b84 100644
---- a/examples/arkode/C_parhyp/CMakeLists.txt
-+++ b/examples/arkode/C_parhyp/CMakeLists.txt
-@@ -44,15 +44,8 @@ ELSE(MPI_MPICC)
- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
- ENDIF(MPI_MPICC)
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECP_LIB sundials_nvecparhyp_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECP_LIB sundials_nvecparhyp_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECP_LIB sundials_nvecparhyp)
-
- # Set-up linker flags and link libraries
- SET(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECP_LIB} ${EXTRA_LINK_LIBS})
-diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
-index 97c3027..3985a4f 100644
---- a/examples/arkode/C_serial/CMakeLists.txt
-+++ b/examples/arkode/C_serial/CMakeLists.txt
-@@ -66,16 +66,8 @@ SET(ARKODE_extras
- plot_sol_log.py
- )
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECS_LIB sundials_nvecserial_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECS_LIB sundials_nvecserial_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECS_LIB sundials_nvecserial)
-
- # Set-up linker flags and link libraries
-
-diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
-index 5454a4f..b9fd85b 100644
---- a/examples/arkode/F77_parallel/CMakeLists.txt
-+++ b/examples/arkode/F77_parallel/CMakeLists.txt
-@@ -45,18 +45,9 @@ ELSE(MPI_MPIF77)
- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
- ENDIF(MPI_MPIF77)
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECP_LIB sundials_nvecparallel_static)
-- SET(FNVECP_LIB sundials_fnvecparallel_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECP_LIB sundials_nvecparallel_shared)
-- SET(FNVECP_LIB sundials_fnvecparallel_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECP_LIB sundials_nvecparallel)
-+SET(FNVECP_LIB sundials_fnvecparallel)
-
- # Only static FCMIX libraries are available
-
-diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
-index 7a9c40e..11e426e 100644
---- a/examples/arkode/F77_serial/CMakeLists.txt
-+++ b/examples/arkode/F77_serial/CMakeLists.txt
-@@ -39,18 +39,9 @@ SET(FARKODE_examples_BL
- SET(ARKODE_extras
- )
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECS_LIB sundials_nvecserial_static)
-- SET(FNVECS_LIB sundials_fnvecserial_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECS_LIB sundials_nvecserial_shared)
-- SET(FNVECS_LIB sundials_fnvecserial_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECS_LIB sundials_nvecserial)
-+SET(FNVECS_LIB sundials_fnvecserial)
-
- # Only static FCMIX libraries are available
-
-diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
-index fca2903..cadec82 100644
---- a/examples/arkode/F90_parallel/CMakeLists.txt
-+++ b/examples/arkode/F90_parallel/CMakeLists.txt
-@@ -44,17 +44,9 @@ ELSE(MPI_MPIF90)
- INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
- ENDIF(MPI_MPIF90)
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECP_LIB sundials_nvecparallel_static)
-- SET(FNVECP_LIB sundials_fnvecparallel_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECP_LIB sundials_nvecparallel_shared)
-- SET(FNVECP_LIB sundials_fnvecparallel_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECP_LIB sundials_nvecparallel)
-+SET(FNVECP_LIB sundials_fnvecparallel)
-
- # Only static FCMIX libraries are available
- SET(FARKODE_LIB sundials_farkode_static)
-diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
-index 62e01db..f33a24f 100644
---- a/examples/arkode/F90_serial/CMakeLists.txt
-+++ b/examples/arkode/F90_serial/CMakeLists.txt
-@@ -47,18 +47,9 @@ SET(ARKODE_extras
- plot_brusselator1D_FEM.py
- )
-
--# Specify libraries to link against (through the target that was used to
--# generate them) based on the value of the variable LINK_LIBRARY_TYPE
--
--IF(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_static)
-- SET(NVECS_LIB sundials_nvecserial_static)
-- SET(FNVECS_LIB sundials_fnvecserial_static)
--ELSE(LINK_LIBRARY_TYPE MATCHES "static")
-- SET(ARKODE_LIB sundials_arkode_shared)
-- SET(NVECS_LIB sundials_nvecserial_shared)
-- SET(FNVECS_LIB sundials_fnvecserial_shared)
--ENDIF(LINK_LIBRARY_TYPE MATCHES "static")
-+SET(ARKODE_LIB sundials_arkode)
-+SET(NVECS_LIB sundials_nvecserial)
-+SET(FNVECS_LIB sundials_fnvecserial)
-
- # Only static FCMIX libraries are available
-
diff --git a/debian/patches/0005-Examples-don-t-call-SUNDIALS_ADD_TEST.patch b/debian/patches/0005-Examples-don-t-call-SUNDIALS_ADD_TEST.patch
new file mode 100644
index 0000000..6288935
--- /dev/null
+++ b/debian/patches/0005-Examples-don-t-call-SUNDIALS_ADD_TEST.patch
@@ -0,0 +1,852 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 2 Apr 2017 19:29:38 -0700
+Subject: Examples: don't call SUNDIALS_ADD_TEST()
+
+Examples should be buildable from /usr/share/doc/libsundials-something. The
+CMakeLists files are written to build them at BUILD time, but I want to already
+assume that the packages are installed and use those
+
+Here the CMakeLists are calling some function that's only useful to use the
+examples as tests, not as examples. This function isn't available in the EXAMPLE
+CMakeLists files, and I don't need it anyway, so I remove the calls
+---
+ examples/arkode/CXX_parallel/CMakeLists.txt | 1 -
+ examples/arkode/CXX_serial/CMakeLists.txt | 2 --
+ examples/arkode/C_openmp/CMakeLists.txt | 1 -
+ examples/arkode/C_parallel/CMakeLists.txt | 1 -
+ examples/arkode/C_parhyp/CMakeLists.txt | 1 -
+ examples/arkode/C_serial/CMakeLists.txt | 4 ----
+ examples/arkode/F77_parallel/CMakeLists.txt | 1 -
+ examples/arkode/F77_serial/CMakeLists.txt | 2 --
+ examples/arkode/F90_parallel/CMakeLists.txt | 1 -
+ examples/arkode/F90_serial/CMakeLists.txt | 3 ---
+ examples/cvode/C_openmp/CMakeLists.txt | 1 -
+ examples/cvode/fcmix_parallel/CMakeLists.txt | 1 -
+ examples/cvode/fcmix_serial/CMakeLists.txt | 4 ----
+ examples/cvode/parallel/CMakeLists.txt | 1 -
+ examples/cvode/parhyp/CMakeLists.txt | 1 -
+ examples/cvode/serial/CMakeLists.txt | 4 ----
+ examples/cvodes/C_openmp/CMakeLists.txt | 1 -
+ examples/cvodes/parallel/CMakeLists.txt | 2 --
+ examples/cvodes/serial/CMakeLists.txt | 9 ---------
+ examples/ida/C_openmp/CMakeLists.txt | 2 --
+ examples/ida/fcmix_openmp/CMakeLists.txt | 2 --
+ examples/ida/fcmix_parallel/CMakeLists.txt | 1 -
+ examples/ida/fcmix_pthreads/CMakeLists.txt | 2 --
+ examples/ida/fcmix_serial/CMakeLists.txt | 2 --
+ examples/ida/parallel/CMakeLists.txt | 1 -
+ examples/ida/petsc/CMakeLists.txt | 1 -
+ examples/ida/serial/CMakeLists.txt | 4 ----
+ examples/idas/C_openmp/CMakeLists.txt | 1 -
+ examples/idas/parallel/CMakeLists.txt | 3 ---
+ examples/idas/serial/CMakeLists.txt | 6 ------
+ examples/kinsol/C_openmp/CMakeLists.txt | 1 -
+ examples/kinsol/fcmix_parallel/CMakeLists.txt | 1 -
+ examples/kinsol/fcmix_serial/CMakeLists.txt | 2 --
+ examples/kinsol/parallel/CMakeLists.txt | 1 -
+ examples/kinsol/serial/CMakeLists.txt | 4 ----
+ examples/nvector/C_openmp/CMakeLists.txt | 6 ------
+ examples/nvector/parallel/CMakeLists.txt | 8 --------
+ examples/nvector/parhyp/CMakeLists.txt | 8 --------
+ examples/nvector/petsc/CMakeLists.txt | 8 --------
+ examples/nvector/pthreads/CMakeLists.txt | 6 ------
+ examples/nvector/serial/CMakeLists.txt | 2 --
+ 41 files changed, 113 deletions(-)
+
+diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt
+index 894edec..c0b6f09 100644
+--- a/examples/arkode/CXX_parallel/CMakeLists.txt
++++ b/examples/arkode/CXX_parallel/CMakeLists.txt
+@@ -69,7 +69,6 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.cpp)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICXX)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/CXX_serial/CMakeLists.txt b/examples/arkode/CXX_serial/CMakeLists.txt
+index d64dd81..a23c451 100644
+--- a/examples/arkode/CXX_serial/CMakeLists.txt
++++ b/examples/arkode/CXX_serial/CMakeLists.txt
+@@ -61,7 +61,6 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.cpp)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.cpp ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/CXX_serial)
+@@ -74,7 +73,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${ARKODE_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.cpp)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.cpp ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/CXX_serial)
+diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
+index ccc55f1..79d2ba6 100644
+--- a/examples/arkode/C_openmp/CMakeLists.txt
++++ b/examples/arkode/C_openmp/CMakeLists.txt
+@@ -60,7 +60,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${ARKODE_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_openmp)
+diff --git a/examples/arkode/C_parallel/CMakeLists.txt b/examples/arkode/C_parallel/CMakeLists.txt
+index 9e61de0..71acc2b 100644
+--- a/examples/arkode/C_parallel/CMakeLists.txt
++++ b/examples/arkode/C_parallel/CMakeLists.txt
+@@ -69,7 +69,6 @@ FOREACH(example_tuple ${ARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
+index b224b84..8775ec1 100644
+--- a/examples/arkode/C_parhyp/CMakeLists.txt
++++ b/examples/arkode/C_parhyp/CMakeLists.txt
+@@ -70,7 +70,6 @@ FOREACH(example_tuple ${ARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ TARGET_LINK_LIBRARIES(${example} ${HYPRE_LIBS})
+ IF(NOT MPI_MPICC)
+diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
+index 3985a4f..235aada 100644
+--- a/examples/arkode/C_serial/CMakeLists.txt
++++ b/examples/arkode/C_serial/CMakeLists.txt
+@@ -89,7 +89,6 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
+@@ -102,7 +101,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${ARKODE_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
+@@ -116,7 +114,6 @@ IF(KLU_FOUND)
+ FOREACH(example ${ARKODE_examples_KLU})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
+@@ -130,7 +127,6 @@ IF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples_SUPERLUMT})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
+diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
+index 19bda13..930e2ec 100644
+--- a/examples/arkode/F77_parallel/CMakeLists.txt
++++ b/examples/arkode/F77_parallel/CMakeLists.txt
+@@ -75,7 +75,6 @@ FOREACH(example_tuple ${FARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
+index f582b6e..86d912d 100644
+--- a/examples/arkode/F77_serial/CMakeLists.txt
++++ b/examples/arkode/F77_serial/CMakeLists.txt
+@@ -65,7 +65,6 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${FARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
+@@ -78,7 +77,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FARKODE_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
+diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
+index 72d9910..31cdd94 100644
+--- a/examples/arkode/F90_parallel/CMakeLists.txt
++++ b/examples/arkode/F90_parallel/CMakeLists.txt
+@@ -72,7 +72,6 @@ FOREACH(example_tuple ${FARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f90)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF90)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
+index 450551f..a150784 100644
+--- a/examples/arkode/F90_serial/CMakeLists.txt
++++ b/examples/arkode/F90_serial/CMakeLists.txt
+@@ -73,7 +73,6 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${FARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.f90)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
+@@ -86,7 +85,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FARKODE_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f90)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
+@@ -100,7 +98,6 @@ IF(KLU_FOUND)
+ FOREACH(example ${FARKODE_examples_KLU})
+ ADD_EXECUTABLE(${example} ${example}.f90)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
+diff --git a/examples/cvode/C_openmp/CMakeLists.txt b/examples/cvode/C_openmp/CMakeLists.txt
+index 2b2cf84..4eb2e54 100644
+--- a/examples/cvode/C_openmp/CMakeLists.txt
++++ b/examples/cvode/C_openmp/CMakeLists.txt
+@@ -55,7 +55,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${CVODE_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/C_openmp)
+diff --git a/examples/cvode/fcmix_parallel/CMakeLists.txt b/examples/cvode/fcmix_parallel/CMakeLists.txt
+index c134e05..9537879 100644
+--- a/examples/cvode/fcmix_parallel/CMakeLists.txt
++++ b/examples/cvode/fcmix_parallel/CMakeLists.txt
+@@ -73,7 +73,6 @@ FOREACH(example_tuple ${FCVODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvode/fcmix_serial/CMakeLists.txt b/examples/cvode/fcmix_serial/CMakeLists.txt
+index fa5265c..626f48d 100644
+--- a/examples/cvode/fcmix_serial/CMakeLists.txt
++++ b/examples/cvode/fcmix_serial/CMakeLists.txt
+@@ -73,7 +73,6 @@ ENDIF(HYPRE_FOUND)
+ FOREACH(example ${FCVODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
+@@ -86,7 +85,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FCVODE_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
+@@ -100,7 +98,6 @@ IF(KLU_FOUND)
+ FOREACH(example ${FCVODE_examples_KLU})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
+@@ -114,7 +111,6 @@ IF(SUPERLUMT_FOUND)
+ FOREACH(example ${FCVODE_examples_SUPERLUMT})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
+diff --git a/examples/cvode/parallel/CMakeLists.txt b/examples/cvode/parallel/CMakeLists.txt
+index e8a61a7..7638d67 100644
+--- a/examples/cvode/parallel/CMakeLists.txt
++++ b/examples/cvode/parallel/CMakeLists.txt
+@@ -69,7 +69,6 @@ FOREACH(example_tuple ${CVODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvode/parhyp/CMakeLists.txt b/examples/cvode/parhyp/CMakeLists.txt
+index 3970601..61e70c7 100644
+--- a/examples/cvode/parhyp/CMakeLists.txt
++++ b/examples/cvode/parhyp/CMakeLists.txt
+@@ -69,7 +69,6 @@ FOREACH(example_tuple ${CVODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvode/serial/CMakeLists.txt b/examples/cvode/serial/CMakeLists.txt
+index 15b4e67..f4db635 100644
+--- a/examples/cvode/serial/CMakeLists.txt
++++ b/examples/cvode/serial/CMakeLists.txt
+@@ -72,7 +72,6 @@ ENDIF(HYPRE_FOUND)
+ FOREACH(example ${CVODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/serial)
+@@ -84,7 +83,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${CVODE_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/serial)
+@@ -98,7 +96,6 @@ IF(KLU_FOUND)
+ FOREACH(example ${CVODE_examples_KLU})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/serial)
+@@ -112,7 +109,6 @@ IF(SUPERLUMT_FOUND)
+ FOREACH(example ${CVODE_examples_SUPERLUMT})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/serial)
+diff --git a/examples/cvodes/C_openmp/CMakeLists.txt b/examples/cvodes/C_openmp/CMakeLists.txt
+index 94db899..933cdb4 100644
+--- a/examples/cvodes/C_openmp/CMakeLists.txt
++++ b/examples/cvodes/C_openmp/CMakeLists.txt
+@@ -55,7 +55,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${CVODES_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvodes/C_openmp)
+diff --git a/examples/cvodes/parallel/CMakeLists.txt b/examples/cvodes/parallel/CMakeLists.txt
+index 36c38cf..638239c 100644
+--- a/examples/cvodes/parallel/CMakeLists.txt
++++ b/examples/cvodes/parallel/CMakeLists.txt
+@@ -85,9 +85,7 @@ FOREACH(example_tuple ${CVODES_examples})
+ IF(n EQUAL 4)
+ LIST(GET example_tuple 3 test_args)
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+- SUNDIALS_ADD_TEST(${test_name} ${example} MPI_NPROCS ${number_of_tasks} TEST_ARGS ${test_args})
+ ELSE()
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+diff --git a/examples/cvodes/serial/CMakeLists.txt b/examples/cvodes/serial/CMakeLists.txt
+index 38f9e05..08c9e2b 100644
+--- a/examples/cvodes/serial/CMakeLists.txt
++++ b/examples/cvodes/serial/CMakeLists.txt
+@@ -97,9 +97,7 @@ FOREACH(example_tuple ${CVODES_examples})
+ IF(n EQUAL 2)
+ LIST(GET example_tuple 1 test_args)
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+- SUNDIALS_ADD_TEST(${test_name} ${example} TEST_ARGS ${test_args})
+ ELSE()
+- SUNDIALS_ADD_TEST(${example} ${example})
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+@@ -116,7 +114,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${CVODES_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ FILE(GLOB example_out ${example}.out*)
+ IF(EXAMPLES_INSTALL)
+@@ -144,9 +141,6 @@ IF(KLU_FOUND)
+ IF(n EQUAL 2)
+ LIST(GET example_tuple 1 test_args)
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+- SUNDIALS_ADD_TEST(${test_name} ${example} TEST_ARGS ${test_args})
+- ELSE()
+- SUNDIALS_ADD_TEST(${example} ${example})
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+@@ -176,9 +170,6 @@ IF(SUPERLUMT_FOUND)
+ IF(n EQUAL 2)
+ LIST(GET example_tuple 1 test_args)
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+- SUNDIALS_ADD_TEST(${test_name} ${example} TEST_ARGS ${test_args})
+- ELSE()
+- SUNDIALS_ADD_TEST(${example} ${example})
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+diff --git a/examples/ida/C_openmp/CMakeLists.txt b/examples/ida/C_openmp/CMakeLists.txt
+index c381b82..a1407c0 100644
+--- a/examples/ida/C_openmp/CMakeLists.txt
++++ b/examples/ida/C_openmp/CMakeLists.txt
+@@ -60,7 +60,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${IDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/C_openmp)
+@@ -74,7 +73,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${IDA_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/C_openmp)
+diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
+index 0cca839..5f928af 100644
+--- a/examples/ida/fcmix_openmp/CMakeLists.txt
++++ b/examples/ida/fcmix_openmp/CMakeLists.txt
+@@ -68,7 +68,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${FIDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp)
+@@ -82,7 +81,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FIDA_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp)
+diff --git a/examples/ida/fcmix_parallel/CMakeLists.txt b/examples/ida/fcmix_parallel/CMakeLists.txt
+index f812ba8..2ad19c8 100644
+--- a/examples/ida/fcmix_parallel/CMakeLists.txt
++++ b/examples/ida/fcmix_parallel/CMakeLists.txt
+@@ -71,7 +71,6 @@ FOREACH(example_tuple ${FIDA_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
+index f3bf5cf..9cf1a67 100644
+--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
++++ b/examples/ida/fcmix_pthreads/CMakeLists.txt
+@@ -63,7 +63,6 @@ ENDIF(PETSC_FOUND)
+
+ FOREACH(example ${FIDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+- SUNDIALS_ADD_TEST(${example} ${example})
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+@@ -78,7 +77,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FIDA_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_pthreads)
+diff --git a/examples/ida/fcmix_serial/CMakeLists.txt b/examples/ida/fcmix_serial/CMakeLists.txt
+index b9d72be..7d3124e 100644
+--- a/examples/ida/fcmix_serial/CMakeLists.txt
++++ b/examples/ida/fcmix_serial/CMakeLists.txt
+@@ -61,7 +61,6 @@ ENDIF(PETSC_FOUND)
+ FOREACH(example ${FIDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial)
+@@ -75,7 +74,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FIDA_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial)
+diff --git a/examples/ida/parallel/CMakeLists.txt b/examples/ida/parallel/CMakeLists.txt
+index 1e18aef..ef11364 100644
+--- a/examples/ida/parallel/CMakeLists.txt
++++ b/examples/ida/parallel/CMakeLists.txt
+@@ -69,7 +69,6 @@ FOREACH(example_tuple ${IDA_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/ida/petsc/CMakeLists.txt b/examples/ida/petsc/CMakeLists.txt
+index bbf5b57..1759991 100644
+--- a/examples/ida/petsc/CMakeLists.txt
++++ b/examples/ida/petsc/CMakeLists.txt
+@@ -63,7 +63,6 @@ FOREACH(example_tuple ${IDA_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/ida/serial/CMakeLists.txt b/examples/ida/serial/CMakeLists.txt
+index 5623f3f..afdfaae 100644
+--- a/examples/ida/serial/CMakeLists.txt
++++ b/examples/ida/serial/CMakeLists.txt
+@@ -75,7 +75,6 @@ ENDIF(PETSC_FOUND)
+ FOREACH(example ${IDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS} ${NVECS_LIB} ${EXTRA_LINK_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/serial)
+@@ -89,7 +88,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${IDA_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/serial)
+@@ -103,7 +101,6 @@ IF(SUPERLUMT_FOUND)
+ FOREACH(example ${IDA_examples_SUPERLUMT})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/serial)
+@@ -117,7 +114,6 @@ IF(KLU_FOUND)
+ FOREACH(example ${IDA_examples_KLU})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/serial)
+diff --git a/examples/idas/C_openmp/CMakeLists.txt b/examples/idas/C_openmp/CMakeLists.txt
+index cf227bf..5b0b5c7 100644
+--- a/examples/idas/C_openmp/CMakeLists.txt
++++ b/examples/idas/C_openmp/CMakeLists.txt
+@@ -55,7 +55,6 @@ FOREACH(example ${IDAS_examples_OMP})
+ IF(NOT ${example} MATCHES "idasFoodWeb_kry_omp") # LEB NOTE: This goes away with TestRunner fix for OpenMP
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ ENDIF()
+ IF(EXAMPLES_INSTALL)
+diff --git a/examples/idas/parallel/CMakeLists.txt b/examples/idas/parallel/CMakeLists.txt
+index 7a859ca..b8c4e52 100644
+--- a/examples/idas/parallel/CMakeLists.txt
++++ b/examples/idas/parallel/CMakeLists.txt
+@@ -83,9 +83,6 @@ FOREACH(example_tuple ${IDAS_examples})
+ IF(n EQUAL 4)
+ LIST(GET example_tuple 3 test_args)
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+- SUNDIALS_ADD_TEST(${test_name} ${example} MPI_NPROCS ${number_of_tasks} TEST_ARGS ${test_args})
+- ELSE()
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+diff --git a/examples/idas/serial/CMakeLists.txt b/examples/idas/serial/CMakeLists.txt
+index b888951..76881ec 100644
+--- a/examples/idas/serial/CMakeLists.txt
++++ b/examples/idas/serial/CMakeLists.txt
+@@ -96,9 +96,6 @@ FOREACH(example_tuple ${IDAS_examples})
+ IF(n EQUAL 2)
+ LIST(GET example_tuple 1 test_args)
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+- SUNDIALS_ADD_TEST(${test_name} ${example} TEST_ARGS ${test_args})
+- ELSE()
+- SUNDIALS_ADD_TEST(${example} ${example})
+ ENDIF()
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+@@ -113,7 +110,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${IDAS_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/idas/serial)
+@@ -127,7 +123,6 @@ ENDIF(LAPACK_FOUND)
+ # FOREACH(example ${IDAS_examples_SUPERLUMT})
+ # ADD_EXECUTABLE(${example} ${example}.c)
+ # SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+-# SUNDIALS_ADD_TEST(${example} ${example})
+ # TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ # IF(EXAMPLES_INSTALL)
+ # INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/idas/serial)
+@@ -141,7 +136,6 @@ ENDIF(LAPACK_FOUND)
+ # FOREACH(example ${IDAS_examples_KLU})
+ # ADD_EXECUTABLE(${example} ${example}.c)
+ # SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+-# SUNDIALS_ADD_TEST(${example} ${example})
+ # TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ # IF(EXAMPLES_INSTALL)
+ # INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/idas/serial)
+diff --git a/examples/kinsol/C_openmp/CMakeLists.txt b/examples/kinsol/C_openmp/CMakeLists.txt
+index a2fd0b8..97a7f5e 100644
+--- a/examples/kinsol/C_openmp/CMakeLists.txt
++++ b/examples/kinsol/C_openmp/CMakeLists.txt
+@@ -55,7 +55,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${KINSOL_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- #SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4) # No test until TestRunner modified for OpenMP
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/C_openmp)
+diff --git a/examples/kinsol/fcmix_parallel/CMakeLists.txt b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+index ef11835..c84b1d4 100644
+--- a/examples/kinsol/fcmix_parallel/CMakeLists.txt
++++ b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+@@ -67,7 +67,6 @@ FOREACH(example_tuple ${FKINSOL_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/kinsol/fcmix_serial/CMakeLists.txt b/examples/kinsol/fcmix_serial/CMakeLists.txt
+index a1afa2e..40427c4 100644
+--- a/examples/kinsol/fcmix_serial/CMakeLists.txt
++++ b/examples/kinsol/fcmix_serial/CMakeLists.txt
+@@ -57,7 +57,6 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${FKINSOL_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial)
+@@ -71,7 +70,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${FKINSOL_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial)
+diff --git a/examples/kinsol/parallel/CMakeLists.txt b/examples/kinsol/parallel/CMakeLists.txt
+index a829ca9..2833e1c 100644
+--- a/examples/kinsol/parallel/CMakeLists.txt
++++ b/examples/kinsol/parallel/CMakeLists.txt
+@@ -63,7 +63,6 @@ FOREACH(example_tuple ${KINSOL_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/kinsol/serial/CMakeLists.txt b/examples/kinsol/serial/CMakeLists.txt
+index 6ed3293..7549d6c 100644
+--- a/examples/kinsol/serial/CMakeLists.txt
++++ b/examples/kinsol/serial/CMakeLists.txt
+@@ -66,7 +66,6 @@ ENDIF(KLU_FOUND)
+ FOREACH(example ${KINSOL_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/serial)
+@@ -80,7 +79,6 @@ IF(LAPACK_FOUND)
+ FOREACH(example ${KINSOL_examples_BL})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/serial)
+@@ -93,7 +91,6 @@ ENDIF(LAPACK_FOUND)
+ IF(SUPERLUMT_FOUND)
+ FOREACH(example ${KINSOL_examples_SUPERLUMT})
+ ADD_EXECUTABLE(${example} ${example}.c)
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/serial)
+@@ -106,7 +103,6 @@ ENDIF(SUPERLUMT_FOUND)
+ IF(KLU_FOUND)
+ FOREACH(example ${KINSOL_examples_KLU})
+ ADD_EXECUTABLE(${example} ${example}.c)
+- SUNDIALS_ADD_TEST(${example} ${example})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/serial)
+diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
+index 7641a16..013c123 100644
+--- a/examples/nvector/C_openmp/CMakeLists.txt
++++ b/examples/nvector/C_openmp/CMakeLists.txt
+@@ -49,13 +49,7 @@ FOREACH(example ${nvector_openmp_examples})
+ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+- SUNDIALS_ADD_TEST(${example}_1000_1_0 ${example} TEST_ARGS 1000 1 0)
+- SUNDIALS_ADD_TEST(${example}_1000_2_0 ${example} TEST_ARGS 1000 2 0)
+- SUNDIALS_ADD_TEST(${example}_1000_4_0 ${example} TEST_ARGS 1000 4 0)
+
+- SUNDIALS_ADD_TEST(${example}_10000_1_0 ${example} TEST_ARGS 10000 1 0)
+- SUNDIALS_ADD_TEST(${example}_10000_2_0 ${example} TEST_ARGS 10000 2 0)
+- SUNDIALS_ADD_TEST(${example}_10000_4_0 ${example} TEST_ARGS 10000 4 0)
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+diff --git a/examples/nvector/parallel/CMakeLists.txt b/examples/nvector/parallel/CMakeLists.txt
+index 1ac0832..b76e6cd 100644
+--- a/examples/nvector/parallel/CMakeLists.txt
++++ b/examples/nvector/parallel/CMakeLists.txt
+@@ -53,21 +53,13 @@ FOREACH(example ${nvector_parallel_examples})
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+ # Run sequentially
+- SUNDIALS_ADD_TEST("${example}" ${example})
+
+ # Run sequentially with arguments
+- SUNDIALS_ADD_TEST("${example}_1000_0" ${example} TEST_ARGS 1000 0)
+
+ # Run in parallel on 4 procs
+- SUNDIALS_ADD_TEST("${example}_4" ${example} MPI_NPROCS 4)
+
+ # Parallel with additional arguments and supplying an answer file
+- SUNDIALS_ADD_TEST("${example}_4_1000_0" ${example} MPI_NPROCS 4 TEST_ARGS 1000 0 ANSWER_FILE ${example})
+
+- # Specify floating point precision and integer percentage for comparison
+- SUNDIALS_ADD_TEST("${example}_precision" ${example} MPI_NPROCS 4 TEST_ARGS 1000 0 ANSWER_FILE ${example}
+- FLOAT_PRECISION 5 INTEGER_PERCENTAGE 0)
+-
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ IF(EXAMPLES_INSTALL)
+diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
+index 95b58fe..a193944 100644
+--- a/examples/nvector/parhyp/CMakeLists.txt
++++ b/examples/nvector/parhyp/CMakeLists.txt
+@@ -57,20 +57,12 @@ FOREACH(example ${nvector_parhyp_examples})
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+ # Run sequentially
+- SUNDIALS_ADD_TEST("${example}" ${example})
+
+ # Run sequentially with arguments
+- SUNDIALS_ADD_TEST("${example}_10000_0" ${example} TEST_ARGS 10000 0)
+
+ # Run in parhyp on 4 procs
+- SUNDIALS_ADD_TEST("${example}_4" ${example} MPI_NPROCS 4)
+
+ # parhyp with additional arguments and supplying an answer file
+- SUNDIALS_ADD_TEST("${example}_4_10000_0" ${example} MPI_NPROCS 4 TEST_ARGS 10000 0 ANSWER_FILE ${example})
+-
+- # Specify floating point precision and integer percentage for comparison
+- SUNDIALS_ADD_TEST("${example}_precision" ${example} MPI_NPROCS 4 TEST_ARGS 10000 0 ANSWER_FILE ${example}
+- FLOAT_PRECISION 5 INTEGER_PERCENTAGE 0)
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
+index b5cfc1d..426e0d3 100644
+--- a/examples/nvector/petsc/CMakeLists.txt
++++ b/examples/nvector/petsc/CMakeLists.txt
+@@ -54,20 +54,12 @@ FOREACH(example ${nvector_petsc_examples})
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+ # Run sequentially
+- SUNDIALS_ADD_TEST("${example}" ${example})
+
+ # Run sequentially with arguments
+- SUNDIALS_ADD_TEST("${example}_1000_0" ${example} TEST_ARGS 1000 0)
+
+ # Run in petsc on 4 procs
+- SUNDIALS_ADD_TEST("${example}_4" ${example} MPI_NPROCS 4)
+
+ # Parallel with additional arguments and supplying an answer file
+- SUNDIALS_ADD_TEST("${example}_4_1000_0" ${example} MPI_NPROCS 4 TEST_ARGS 1000 0 ANSWER_FILE ${example})
+-
+- # Specify floating point precision and integer percentage for comparison
+- SUNDIALS_ADD_TEST("${example}_precision" ${example} MPI_NPROCS 4 TEST_ARGS 1000 0 ANSWER_FILE ${example}
+- FLOAT_PRECISION 5 INTEGER_PERCENTAGE 0)
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ TARGET_LINK_LIBRARIES(${example} ${PETSC_LIBRARIES})
+diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
+index d756f8c..9edbd37 100644
+--- a/examples/nvector/pthreads/CMakeLists.txt
++++ b/examples/nvector/pthreads/CMakeLists.txt
+@@ -51,13 +51,7 @@ FOREACH(example ${nvector_pthreads_examples})
+ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+- SUNDIALS_ADD_TEST(${example}_1000_1_0 ${example} TEST_ARGS 1000 1 0)
+- SUNDIALS_ADD_TEST(${example}_1000_2_0 ${example} TEST_ARGS 1000 2 0)
+- SUNDIALS_ADD_TEST(${example}_1000_4_0 ${example} TEST_ARGS 1000 4 0)
+
+- SUNDIALS_ADD_TEST(${example}_10000_1_0 ${example} TEST_ARGS 10000 1 0)
+- SUNDIALS_ADD_TEST(${example}_10000_2_0 ${example} TEST_ARGS 10000 2 0)
+- SUNDIALS_ADD_TEST(${example}_10000_4_0 ${example} TEST_ARGS 10000 4 0)
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
+index 7605067..1bfe87f 100644
+--- a/examples/nvector/serial/CMakeLists.txt
++++ b/examples/nvector/serial/CMakeLists.txt
+@@ -51,8 +51,6 @@ FOREACH(example ${nvector_serial_examples})
+ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+- SUNDIALS_ADD_TEST( ${example}_1000_0 ${example} TEST_ARGS 1000 0)
+- SUNDIALS_ADD_TEST( ${example}_10000_0 ${example} TEST_ARGS 10000 0)
+
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
diff --git a/debian/patches/0005-arkode-examples-don-t-call-SUNDIALS_ADD_TEST.patch b/debian/patches/0005-arkode-examples-don-t-call-SUNDIALS_ADD_TEST.patch
deleted file mode 100644
index ae9e13a..0000000
--- a/debian/patches/0005-arkode-examples-don-t-call-SUNDIALS_ADD_TEST.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 2 Apr 2017 19:29:38 -0700
-Subject: arkode examples: don't call SUNDIALS_ADD_TEST()
-
-This should be applied to ALL examples. These examples should be buildable from
-/usr/share/doc/libsundials-something. The CMakeLists files are written to build
-them at BUILD time, but I want to already assume that the packages are installed
-and use those
-
-Here the CMakeLists are calling some function that's only useful to use the
-examples as tests, not as examples. This function isn't available in the EXAMPLE
-CMakeLists files, and I don't need it anyway, so I remove the calls
----
- examples/arkode/CXX_parallel/CMakeLists.txt | 1 -
- examples/arkode/CXX_serial/CMakeLists.txt | 2 --
- examples/arkode/C_openmp/CMakeLists.txt | 1 -
- examples/arkode/C_parallel/CMakeLists.txt | 1 -
- examples/arkode/C_parhyp/CMakeLists.txt | 1 -
- examples/arkode/C_serial/CMakeLists.txt | 4 ----
- examples/arkode/F77_parallel/CMakeLists.txt | 1 -
- examples/arkode/F77_serial/CMakeLists.txt | 2 --
- examples/arkode/F90_parallel/CMakeLists.txt | 1 -
- examples/arkode/F90_serial/CMakeLists.txt | 3 ---
- 10 files changed, 17 deletions(-)
-
-diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt
-index 894edec..c0b6f09 100644
---- a/examples/arkode/CXX_parallel/CMakeLists.txt
-+++ b/examples/arkode/CXX_parallel/CMakeLists.txt
-@@ -69,7 +69,6 @@ ENDIF(SUPERLUMT_FOUND)
- FOREACH(example ${ARKODE_examples})
- ADD_EXECUTABLE(${example} ${example}.cpp)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(NOT MPI_MPICXX)
- TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-diff --git a/examples/arkode/CXX_serial/CMakeLists.txt b/examples/arkode/CXX_serial/CMakeLists.txt
-index d64dd81..a23c451 100644
---- a/examples/arkode/CXX_serial/CMakeLists.txt
-+++ b/examples/arkode/CXX_serial/CMakeLists.txt
-@@ -61,7 +61,6 @@ ENDIF(SUPERLUMT_FOUND)
- FOREACH(example ${ARKODE_examples})
- ADD_EXECUTABLE(${example} ${example}.cpp)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.cpp ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/CXX_serial)
-@@ -74,7 +73,6 @@ IF(LAPACK_FOUND)
- FOREACH(example ${ARKODE_examples_BL})
- ADD_EXECUTABLE(${example} ${example}.cpp)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.cpp ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/CXX_serial)
-diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
-index ccc55f1..79d2ba6 100644
---- a/examples/arkode/C_openmp/CMakeLists.txt
-+++ b/examples/arkode/C_openmp/CMakeLists.txt
-@@ -60,7 +60,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
- FOREACH(example ${ARKODE_examples_OMP})
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example} TEST_ARGS 4)
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_openmp)
-diff --git a/examples/arkode/C_parallel/CMakeLists.txt b/examples/arkode/C_parallel/CMakeLists.txt
-index 9e61de0..71acc2b 100644
---- a/examples/arkode/C_parallel/CMakeLists.txt
-+++ b/examples/arkode/C_parallel/CMakeLists.txt
-@@ -69,7 +69,6 @@ FOREACH(example_tuple ${ARKODE_examples})
- # first item is example
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(NOT MPI_MPICC)
- TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
-index b224b84..8775ec1 100644
---- a/examples/arkode/C_parhyp/CMakeLists.txt
-+++ b/examples/arkode/C_parhyp/CMakeLists.txt
-@@ -70,7 +70,6 @@ FOREACH(example_tuple ${ARKODE_examples})
- # first item is example
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- TARGET_LINK_LIBRARIES(${example} ${HYPRE_LIBS})
- IF(NOT MPI_MPICC)
-diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
-index 3985a4f..235aada 100644
---- a/examples/arkode/C_serial/CMakeLists.txt
-+++ b/examples/arkode/C_serial/CMakeLists.txt
-@@ -89,7 +89,6 @@ ENDIF(SUPERLUMT_FOUND)
- FOREACH(example ${ARKODE_examples})
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
-@@ -102,7 +101,6 @@ IF(LAPACK_FOUND)
- FOREACH(example ${ARKODE_examples_BL})
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
-@@ -116,7 +114,6 @@ IF(KLU_FOUND)
- FOREACH(example ${ARKODE_examples_KLU})
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
-@@ -130,7 +127,6 @@ IF(SUPERLUMT_FOUND)
- FOREACH(example ${ARKODE_examples_SUPERLUMT})
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
-diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
-index b9fd85b..77e56a5 100644
---- a/examples/arkode/F77_parallel/CMakeLists.txt
-+++ b/examples/arkode/F77_parallel/CMakeLists.txt
-@@ -77,7 +77,6 @@ FOREACH(example_tuple ${FARKODE_examples})
- # first item is example
- ADD_EXECUTABLE(${example} ${example}.f)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(NOT MPI_MPIF77)
- TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
-index 11e426e..68e828f 100644
---- a/examples/arkode/F77_serial/CMakeLists.txt
-+++ b/examples/arkode/F77_serial/CMakeLists.txt
-@@ -67,7 +67,6 @@ ENDIF(SUPERLUMT_FOUND)
- FOREACH(example ${FARKODE_examples})
- ADD_EXECUTABLE(${example} ${example}.f)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-@@ -80,7 +79,6 @@ IF(LAPACK_FOUND)
- FOREACH(example ${FARKODE_examples_BL})
- ADD_EXECUTABLE(${example} ${example}.f)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
-index cadec82..9bcb2c8 100644
---- a/examples/arkode/F90_parallel/CMakeLists.txt
-+++ b/examples/arkode/F90_parallel/CMakeLists.txt
-@@ -73,7 +73,6 @@ FOREACH(example_tuple ${FARKODE_examples})
- # first item is example
- ADD_EXECUTABLE(${example} ${example}.f90)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example} MPI_NPROCS ${number_of_tasks})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(NOT MPI_MPIF90)
- TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
-index f33a24f..82f33e0 100644
---- a/examples/arkode/F90_serial/CMakeLists.txt
-+++ b/examples/arkode/F90_serial/CMakeLists.txt
-@@ -75,7 +75,6 @@ ENDIF(SUPERLUMT_FOUND)
- FOREACH(example ${FARKODE_examples})
- ADD_EXECUTABLE(${example} ${example}.f90)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-@@ -88,7 +87,6 @@ IF(LAPACK_FOUND)
- FOREACH(example ${FARKODE_examples_BL})
- ADD_EXECUTABLE(${example} ${example}.f90)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-@@ -102,7 +100,6 @@ IF(KLU_FOUND)
- FOREACH(example ${FARKODE_examples_KLU})
- ADD_EXECUTABLE(${example} ${example}.f90)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
-- SUNDIALS_ADD_TEST(${example} ${example})
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
diff --git a/debian/patches/0006-Examples-link-with-lm.patch b/debian/patches/0006-Examples-link-with-lm.patch
new file mode 100644
index 0000000..1b67ee9
--- /dev/null
+++ b/debian/patches/0006-Examples-link-with-lm.patch
@@ -0,0 +1,540 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 2 Apr 2017 19:30:16 -0700
+Subject: Examples link with -lm
+
+---
+ examples/arkode/CXX_parallel/CMakeLists.txt | 1 +
+ examples/arkode/CXX_serial/CMakeLists.txt | 1 +
+ examples/arkode/C_openmp/CMakeLists.txt | 1 +
+ examples/arkode/C_parallel/CMakeLists.txt | 1 +
+ examples/arkode/C_parhyp/CMakeLists.txt | 1 +
+ examples/arkode/C_serial/CMakeLists.txt | 1 +
+ examples/arkode/F77_parallel/CMakeLists.txt | 1 +
+ examples/arkode/F77_serial/CMakeLists.txt | 1 +
+ examples/arkode/F90_parallel/CMakeLists.txt | 1 +
+ examples/arkode/F90_serial/CMakeLists.txt | 1 +
+ examples/cvode/C_openmp/CMakeLists.txt | 1 +
+ examples/cvode/fcmix_parallel/CMakeLists.txt | 1 +
+ examples/cvode/fcmix_serial/CMakeLists.txt | 1 +
+ examples/cvode/parallel/CMakeLists.txt | 1 +
+ examples/cvode/parhyp/CMakeLists.txt | 1 +
+ examples/cvode/serial/CMakeLists.txt | 1 +
+ examples/cvodes/C_openmp/CMakeLists.txt | 1 +
+ examples/cvodes/parallel/CMakeLists.txt | 1 +
+ examples/cvodes/serial/CMakeLists.txt | 1 +
+ examples/ida/C_openmp/CMakeLists.txt | 1 +
+ examples/ida/fcmix_openmp/CMakeLists.txt | 1 +
+ examples/ida/fcmix_parallel/CMakeLists.txt | 1 +
+ examples/ida/fcmix_pthreads/CMakeLists.txt | 1 +
+ examples/ida/fcmix_serial/CMakeLists.txt | 1 +
+ examples/ida/parallel/CMakeLists.txt | 1 +
+ examples/ida/petsc/CMakeLists.txt | 1 +
+ examples/ida/serial/CMakeLists.txt | 1 +
+ examples/idas/C_openmp/CMakeLists.txt | 1 +
+ examples/idas/parallel/CMakeLists.txt | 1 +
+ examples/idas/serial/CMakeLists.txt | 1 +
+ examples/kinsol/C_openmp/CMakeLists.txt | 1 +
+ examples/kinsol/fcmix_parallel/CMakeLists.txt | 1 +
+ examples/kinsol/fcmix_serial/CMakeLists.txt | 1 +
+ examples/kinsol/parallel/CMakeLists.txt | 1 +
+ examples/kinsol/serial/CMakeLists.txt | 1 +
+ examples/nvector/C_openmp/CMakeLists.txt | 1 +
+ examples/nvector/parallel/CMakeLists.txt | 1 +
+ examples/nvector/parhyp/CMakeLists.txt | 1 +
+ examples/nvector/petsc/CMakeLists.txt | 1 +
+ examples/nvector/pthreads/CMakeLists.txt | 1 +
+ examples/nvector/serial/CMakeLists.txt | 1 +
+ 41 files changed, 41 insertions(+)
+
+diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt
+index c0b6f09..658a7ef 100644
+--- a/examples/arkode/CXX_parallel/CMakeLists.txt
++++ b/examples/arkode/CXX_parallel/CMakeLists.txt
+@@ -69,6 +69,7 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.cpp)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICXX)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/CXX_serial/CMakeLists.txt b/examples/arkode/CXX_serial/CMakeLists.txt
+index a23c451..ee8ee75 100644
+--- a/examples/arkode/CXX_serial/CMakeLists.txt
++++ b/examples/arkode/CXX_serial/CMakeLists.txt
+@@ -61,6 +61,7 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.cpp)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.cpp ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/CXX_serial)
+diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
+index 79d2ba6..066e4d2 100644
+--- a/examples/arkode/C_openmp/CMakeLists.txt
++++ b/examples/arkode/C_openmp/CMakeLists.txt
+@@ -60,6 +60,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${ARKODE_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_openmp)
+diff --git a/examples/arkode/C_parallel/CMakeLists.txt b/examples/arkode/C_parallel/CMakeLists.txt
+index 71acc2b..ed99c55 100644
+--- a/examples/arkode/C_parallel/CMakeLists.txt
++++ b/examples/arkode/C_parallel/CMakeLists.txt
+@@ -69,6 +69,7 @@ FOREACH(example_tuple ${ARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
+index 8775ec1..faa6811 100644
+--- a/examples/arkode/C_parhyp/CMakeLists.txt
++++ b/examples/arkode/C_parhyp/CMakeLists.txt
+@@ -70,6 +70,7 @@ FOREACH(example_tuple ${ARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ TARGET_LINK_LIBRARIES(${example} ${HYPRE_LIBS})
+ IF(NOT MPI_MPICC)
+diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
+index 235aada..3eb4722 100644
+--- a/examples/arkode/C_serial/CMakeLists.txt
++++ b/examples/arkode/C_serial/CMakeLists.txt
+@@ -89,6 +89,7 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${ARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
+diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
+index 930e2ec..7582bd0 100644
+--- a/examples/arkode/F77_parallel/CMakeLists.txt
++++ b/examples/arkode/F77_parallel/CMakeLists.txt
+@@ -75,6 +75,7 @@ FOREACH(example_tuple ${FARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
+index 86d912d..b8a1978 100644
+--- a/examples/arkode/F77_serial/CMakeLists.txt
++++ b/examples/arkode/F77_serial/CMakeLists.txt
+@@ -65,6 +65,7 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${FARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
+diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
+index 31cdd94..ed989f2 100644
+--- a/examples/arkode/F90_parallel/CMakeLists.txt
++++ b/examples/arkode/F90_parallel/CMakeLists.txt
+@@ -72,6 +72,7 @@ FOREACH(example_tuple ${FARKODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f90)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF90)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
+index a150784..c2e706d 100644
+--- a/examples/arkode/F90_serial/CMakeLists.txt
++++ b/examples/arkode/F90_serial/CMakeLists.txt
+@@ -73,6 +73,7 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${FARKODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.f90)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f90 ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
+diff --git a/examples/cvode/C_openmp/CMakeLists.txt b/examples/cvode/C_openmp/CMakeLists.txt
+index 4eb2e54..071ea69 100644
+--- a/examples/cvode/C_openmp/CMakeLists.txt
++++ b/examples/cvode/C_openmp/CMakeLists.txt
+@@ -55,6 +55,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${CVODE_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/C_openmp)
+diff --git a/examples/cvode/fcmix_parallel/CMakeLists.txt b/examples/cvode/fcmix_parallel/CMakeLists.txt
+index 9537879..2430dea 100644
+--- a/examples/cvode/fcmix_parallel/CMakeLists.txt
++++ b/examples/cvode/fcmix_parallel/CMakeLists.txt
+@@ -73,6 +73,7 @@ FOREACH(example_tuple ${FCVODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvode/fcmix_serial/CMakeLists.txt b/examples/cvode/fcmix_serial/CMakeLists.txt
+index 626f48d..0675ad4 100644
+--- a/examples/cvode/fcmix_serial/CMakeLists.txt
++++ b/examples/cvode/fcmix_serial/CMakeLists.txt
+@@ -73,6 +73,7 @@ ENDIF(HYPRE_FOUND)
+ FOREACH(example ${FCVODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
+diff --git a/examples/cvode/parallel/CMakeLists.txt b/examples/cvode/parallel/CMakeLists.txt
+index 7638d67..9381ee3 100644
+--- a/examples/cvode/parallel/CMakeLists.txt
++++ b/examples/cvode/parallel/CMakeLists.txt
+@@ -69,6 +69,7 @@ FOREACH(example_tuple ${CVODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvode/parhyp/CMakeLists.txt b/examples/cvode/parhyp/CMakeLists.txt
+index 61e70c7..bd4d6b9 100644
+--- a/examples/cvode/parhyp/CMakeLists.txt
++++ b/examples/cvode/parhyp/CMakeLists.txt
+@@ -69,6 +69,7 @@ FOREACH(example_tuple ${CVODE_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvode/serial/CMakeLists.txt b/examples/cvode/serial/CMakeLists.txt
+index f4db635..52a97e7 100644
+--- a/examples/cvode/serial/CMakeLists.txt
++++ b/examples/cvode/serial/CMakeLists.txt
+@@ -72,6 +72,7 @@ ENDIF(HYPRE_FOUND)
+ FOREACH(example ${CVODE_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/serial)
+diff --git a/examples/cvodes/C_openmp/CMakeLists.txt b/examples/cvodes/C_openmp/CMakeLists.txt
+index 933cdb4..184e2f7 100644
+--- a/examples/cvodes/C_openmp/CMakeLists.txt
++++ b/examples/cvodes/C_openmp/CMakeLists.txt
+@@ -55,6 +55,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${CVODES_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/cvodes/C_openmp)
+diff --git a/examples/cvodes/parallel/CMakeLists.txt b/examples/cvodes/parallel/CMakeLists.txt
+index 638239c..1b80a87 100644
+--- a/examples/cvodes/parallel/CMakeLists.txt
++++ b/examples/cvodes/parallel/CMakeLists.txt
+@@ -88,6 +88,7 @@ FOREACH(example_tuple ${CVODES_examples})
+ ELSE()
+ ENDIF()
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/cvodes/serial/CMakeLists.txt b/examples/cvodes/serial/CMakeLists.txt
+index 08c9e2b..d5403f1 100644
+--- a/examples/cvodes/serial/CMakeLists.txt
++++ b/examples/cvodes/serial/CMakeLists.txt
+@@ -100,6 +100,7 @@ FOREACH(example_tuple ${CVODES_examples})
+ ELSE()
+ ENDIF()
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ FILE(GLOB example_out ${example}.out*)
+ IF(EXAMPLES_INSTALL)
+diff --git a/examples/ida/C_openmp/CMakeLists.txt b/examples/ida/C_openmp/CMakeLists.txt
+index a1407c0..6ca2df1 100644
+--- a/examples/ida/C_openmp/CMakeLists.txt
++++ b/examples/ida/C_openmp/CMakeLists.txt
+@@ -60,6 +60,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${IDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/C_openmp)
+diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
+index 5f928af..894bed4 100644
+--- a/examples/ida/fcmix_openmp/CMakeLists.txt
++++ b/examples/ida/fcmix_openmp/CMakeLists.txt
+@@ -68,6 +68,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${FIDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp)
+diff --git a/examples/ida/fcmix_parallel/CMakeLists.txt b/examples/ida/fcmix_parallel/CMakeLists.txt
+index 2ad19c8..278bc8d 100644
+--- a/examples/ida/fcmix_parallel/CMakeLists.txt
++++ b/examples/ida/fcmix_parallel/CMakeLists.txt
+@@ -71,6 +71,7 @@ FOREACH(example_tuple ${FIDA_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
+index 9cf1a67..cf055b9 100644
+--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
++++ b/examples/ida/fcmix_pthreads/CMakeLists.txt
+@@ -64,6 +64,7 @@ ENDIF(PETSC_FOUND)
+ FOREACH(example ${FIDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_pthreads)
+diff --git a/examples/ida/fcmix_serial/CMakeLists.txt b/examples/ida/fcmix_serial/CMakeLists.txt
+index 7d3124e..acb4437 100644
+--- a/examples/ida/fcmix_serial/CMakeLists.txt
++++ b/examples/ida/fcmix_serial/CMakeLists.txt
+@@ -61,6 +61,7 @@ ENDIF(PETSC_FOUND)
+ FOREACH(example ${FIDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial)
+diff --git a/examples/ida/parallel/CMakeLists.txt b/examples/ida/parallel/CMakeLists.txt
+index ef11364..6324668 100644
+--- a/examples/ida/parallel/CMakeLists.txt
++++ b/examples/ida/parallel/CMakeLists.txt
+@@ -69,6 +69,7 @@ FOREACH(example_tuple ${IDA_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/ida/petsc/CMakeLists.txt b/examples/ida/petsc/CMakeLists.txt
+index 1759991..5934ac0 100644
+--- a/examples/ida/petsc/CMakeLists.txt
++++ b/examples/ida/petsc/CMakeLists.txt
+@@ -63,6 +63,7 @@ FOREACH(example_tuple ${IDA_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/ida/serial/CMakeLists.txt b/examples/ida/serial/CMakeLists.txt
+index afdfaae..8400927 100644
+--- a/examples/ida/serial/CMakeLists.txt
++++ b/examples/ida/serial/CMakeLists.txt
+@@ -75,6 +75,7 @@ ENDIF(PETSC_FOUND)
+ FOREACH(example ${IDA_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS} ${NVECS_LIB} ${EXTRA_LINK_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/serial)
+diff --git a/examples/idas/C_openmp/CMakeLists.txt b/examples/idas/C_openmp/CMakeLists.txt
+index 5b0b5c7..1c7069a 100644
+--- a/examples/idas/C_openmp/CMakeLists.txt
++++ b/examples/idas/C_openmp/CMakeLists.txt
+@@ -55,6 +55,7 @@ FOREACH(example ${IDAS_examples_OMP})
+ IF(NOT ${example} MATCHES "idasFoodWeb_kry_omp") # LEB NOTE: This goes away with TestRunner fix for OpenMP
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ ENDIF()
+ IF(EXAMPLES_INSTALL)
+diff --git a/examples/idas/parallel/CMakeLists.txt b/examples/idas/parallel/CMakeLists.txt
+index b8c4e52..404da62 100644
+--- a/examples/idas/parallel/CMakeLists.txt
++++ b/examples/idas/parallel/CMakeLists.txt
+@@ -85,6 +85,7 @@ FOREACH(example_tuple ${IDAS_examples})
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+ ENDIF()
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/idas/serial/CMakeLists.txt b/examples/idas/serial/CMakeLists.txt
+index 76881ec..959fbc6 100644
+--- a/examples/idas/serial/CMakeLists.txt
++++ b/examples/idas/serial/CMakeLists.txt
+@@ -98,6 +98,7 @@ FOREACH(example_tuple ${IDAS_examples})
+ STRING(REGEX REPLACE " " "_" test_name ${example}_${test_args})
+ ENDIF()
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/idas/serial)
+diff --git a/examples/kinsol/C_openmp/CMakeLists.txt b/examples/kinsol/C_openmp/CMakeLists.txt
+index 97a7f5e..f507c59 100644
+--- a/examples/kinsol/C_openmp/CMakeLists.txt
++++ b/examples/kinsol/C_openmp/CMakeLists.txt
+@@ -55,6 +55,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ FOREACH(example ${KINSOL_examples_OMP})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/C_openmp)
+diff --git a/examples/kinsol/fcmix_parallel/CMakeLists.txt b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+index c84b1d4..96ab441 100644
+--- a/examples/kinsol/fcmix_parallel/CMakeLists.txt
++++ b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+@@ -67,6 +67,7 @@ FOREACH(example_tuple ${FKINSOL_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPIF77)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/kinsol/fcmix_serial/CMakeLists.txt b/examples/kinsol/fcmix_serial/CMakeLists.txt
+index 40427c4..7dee897 100644
+--- a/examples/kinsol/fcmix_serial/CMakeLists.txt
++++ b/examples/kinsol/fcmix_serial/CMakeLists.txt
+@@ -57,6 +57,7 @@ ENDIF(SUPERLUMT_FOUND)
+ FOREACH(example ${FKINSOL_examples})
+ ADD_EXECUTABLE(${example} ${example}.f)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.f ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial)
+diff --git a/examples/kinsol/parallel/CMakeLists.txt b/examples/kinsol/parallel/CMakeLists.txt
+index 2833e1c..9b78e60 100644
+--- a/examples/kinsol/parallel/CMakeLists.txt
++++ b/examples/kinsol/parallel/CMakeLists.txt
+@@ -63,6 +63,7 @@ FOREACH(example_tuple ${KINSOL_examples})
+ # first item is example
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(NOT MPI_MPICC)
+ TARGET_LINK_LIBRARIES(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
+diff --git a/examples/kinsol/serial/CMakeLists.txt b/examples/kinsol/serial/CMakeLists.txt
+index 7549d6c..f0d0912 100644
+--- a/examples/kinsol/serial/CMakeLists.txt
++++ b/examples/kinsol/serial/CMakeLists.txt
+@@ -66,6 +66,7 @@ ENDIF(KLU_FOUND)
+ FOREACH(example ${KINSOL_examples})
+ ADD_EXECUTABLE(${example} ${example}.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+ IF(EXAMPLES_INSTALL)
+ INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/serial)
+diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
+index 013c123..7c1ab91 100644
+--- a/examples/nvector/C_openmp/CMakeLists.txt
++++ b/examples/nvector/C_openmp/CMakeLists.txt
+@@ -51,6 +51,7 @@ FOREACH(example ${nvector_openmp_examples})
+
+
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ IF(EXAMPLES_INSTALL)
+diff --git a/examples/nvector/parallel/CMakeLists.txt b/examples/nvector/parallel/CMakeLists.txt
+index b76e6cd..37dd1b1 100644
+--- a/examples/nvector/parallel/CMakeLists.txt
++++ b/examples/nvector/parallel/CMakeLists.txt
+@@ -42,6 +42,7 @@ IF(MPI_MPICC)
+ ELSE(MPI_MPICC)
+ # add MPI_INCLUDE_PATH to include directories
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} MPI_LIBRARIES)
+ ENDIF(MPI_MPICC)
+
+diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
+index a193944..8c6e605 100644
+--- a/examples/nvector/parhyp/CMakeLists.txt
++++ b/examples/nvector/parhyp/CMakeLists.txt
+@@ -46,6 +46,7 @@ IF(MPI_MPICC)
+ ELSE(MPI_MPICC)
+ # add MPI_INCLUDE_PATH to include directories
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} MPI_LIBRARIES)
+ ENDIF(MPI_MPICC)
+
+diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
+index 426e0d3..afa09fb 100644
+--- a/examples/nvector/petsc/CMakeLists.txt
++++ b/examples/nvector/petsc/CMakeLists.txt
+@@ -43,6 +43,7 @@ IF(MPI_MPICC)
+ ELSE(MPI_MPICC)
+ # add MPI_INCLUDE_PATH to include directories
+ INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} MPI_LIBRARIES)
+ ENDIF(MPI_MPICC)
+
+diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
+index 9edbd37..1c171c8 100644
+--- a/examples/nvector/pthreads/CMakeLists.txt
++++ b/examples/nvector/pthreads/CMakeLists.txt
+@@ -53,6 +53,7 @@ FOREACH(example ${nvector_pthreads_examples})
+
+
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ TARGET_LINK_LIBRARIES(${example} ${CMAKE_THREAD_LIBS_INIT})
+diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
+index 1bfe87f..9b0afe9 100644
+--- a/examples/nvector/serial/CMakeLists.txt
++++ b/examples/nvector/serial/CMakeLists.txt
+@@ -52,6 +52,7 @@ FOREACH(example ${nvector_serial_examples})
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+
++ TARGET_LINK_LIBRARIES(${example} -lm)
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ IF(EXAMPLES_INSTALL)
diff --git a/debian/patches/0006-example-added-forgotten-library-linkage.patch b/debian/patches/0006-example-added-forgotten-library-linkage.patch
deleted file mode 100644
index 38566f9..0000000
--- a/debian/patches/0006-example-added-forgotten-library-linkage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 2 Apr 2017 19:30:16 -0700
-Subject: example: added forgotten library linkage
-
----
- examples/arkode/C_serial/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
-index 235aada..d03b645 100644
---- a/examples/arkode/C_serial/CMakeLists.txt
-+++ b/examples/arkode/C_serial/CMakeLists.txt
-@@ -90,6 +90,7 @@ FOREACH(example ${ARKODE_examples})
- ADD_EXECUTABLE(${example} ${example}.c)
- SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
- TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
-+ TARGET_LINK_LIBRARIES(${example} -lm)
- IF(EXAMPLES_INSTALL)
- INSTALL(FILES ${example}.c ${example}.out DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/C_serial)
- ENDIF(EXAMPLES_INSTALL)
diff --git a/debian/patches/0007-Examples-OpenMP-examples-assume-that-we-HAVE-OpenMP.patch b/debian/patches/0007-Examples-OpenMP-examples-assume-that-we-HAVE-OpenMP.patch
new file mode 100644
index 0000000..7d88c3f
--- /dev/null
+++ b/debian/patches/0007-Examples-OpenMP-examples-assume-that-we-HAVE-OpenMP.patch
@@ -0,0 +1,184 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sat, 20 May 2017 23:52:28 -0700
+Subject: Examples: OpenMP examples assume that we HAVE OpenMP
+
+---
+ examples/arkode/C_openmp/CMakeLists.txt | 5 -----
+ examples/cvode/C_openmp/CMakeLists.txt | 5 -----
+ examples/cvodes/C_openmp/CMakeLists.txt | 5 -----
+ examples/ida/C_openmp/CMakeLists.txt | 3 ---
+ examples/ida/fcmix_openmp/CMakeLists.txt | 4 ----
+ examples/idas/C_openmp/CMakeLists.txt | 3 ---
+ examples/kinsol/C_openmp/CMakeLists.txt | 5 -----
+ examples/nvector/C_openmp/CMakeLists.txt | 10 ++++------
+ 8 files changed, 4 insertions(+), 36 deletions(-)
+
+diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
+index 066e4d2..6f98297 100644
+--- a/examples/arkode/C_openmp/CMakeLists.txt
++++ b/examples/arkode/C_openmp/CMakeLists.txt
+@@ -20,9 +20,6 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE OpenMP examples
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+-
+ # Add variable ARKode_examples_OMP with the names of the openmp ARKode examples
+ SET(ARKODE_examples_OMP
+ ark_brusselator1D_omp
+@@ -33,8 +30,6 @@ SET(ARKODE_extras_OMP
+ plot_brusselator1D.py
+ )
+
+-ENDIF(OPENMP_FOUND)
+-
+ SET(ARKODE_LIB sundials_arkode)
+ SET(NVECOMP_LIB sundials_nvecopenmp)
+
+diff --git a/examples/cvode/C_openmp/CMakeLists.txt b/examples/cvode/C_openmp/CMakeLists.txt
+index 071ea69..ad66f14 100644
+--- a/examples/cvode/C_openmp/CMakeLists.txt
++++ b/examples/cvode/C_openmp/CMakeLists.txt
+@@ -20,16 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for CVODE OpenMP examples
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+-
+ # Add variable CVODE_examples_OMP with the names of the openmp CVODE examples
+ SET(CVODE_examples_OMP
+ cvAdvDiff_bnd_omp
+ )
+
+-ENDIF(OPENMP_FOUND)
+-
+ SET(CVODE_LIB sundials_cvode)
+ SET(NVECOMP_LIB sundials_nvecopenmp)
+
+diff --git a/examples/cvodes/C_openmp/CMakeLists.txt b/examples/cvodes/C_openmp/CMakeLists.txt
+index 184e2f7..7c9b9a0 100644
+--- a/examples/cvodes/C_openmp/CMakeLists.txt
++++ b/examples/cvodes/C_openmp/CMakeLists.txt
+@@ -20,16 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for CVODES OpenMP examples
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+-
+ # Add variable CVODES_examples_OMP with the names of the openmp CVODES examples
+ SET(CVODES_examples_OMP
+ cvsAdvDiff_bnd_omp
+ )
+
+-ENDIF(OPENMP_FOUND)
+-
+ SET(CVODES_LIB sundials_cvodes)
+ SET(NVECOMP_LIB sundials_nvecopenmp)
+
+diff --git a/examples/ida/C_openmp/CMakeLists.txt b/examples/ida/C_openmp/CMakeLists.txt
+index 6ca2df1..99d8738 100644
+--- a/examples/ida/C_openmp/CMakeLists.txt
++++ b/examples/ida/C_openmp/CMakeLists.txt
+@@ -17,8 +17,6 @@
+ # CMakeLists.txt file for the IDA OpenMP examples
+
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+ # Add variable ida_examples with the names of the openmp IDA examples
+ SET(IDA_examples
+ idaFoodWeb_bnd_omp
+@@ -27,7 +25,6 @@ IF(OPENMP_FOUND)
+
+ SET(IDA_examples_BL
+ )
+-ENDIF(OPENMP_FOUND)
+
+ SET(IDA_LIB sundials_ida)
+ SET(NVECS_LIB sundials_nvecopenmp)
+diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
+index 894bed4..df23c02 100644
+--- a/examples/ida/fcmix_openmp/CMakeLists.txt
++++ b/examples/ida/fcmix_openmp/CMakeLists.txt
+@@ -17,9 +17,6 @@
+ # CMakeLists.txt file for the FIDA opemp examples
+
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+-
+ # Add variable ida_examples with the names of the openmp FIDA examples
+ SET(FIDA_examples
+ fidaRoberts_dns_openmp
+@@ -30,7 +27,6 @@ SET(FIDA_examples
+
+ SET(FIDA_examples_BL
+ )
+-ENDIF(OPENMP_FOUND)
+
+ SET(IDA_LIB sundials_ida)
+ SET(NVECS_LIB sundials_nvecopenmp)
+diff --git a/examples/idas/C_openmp/CMakeLists.txt b/examples/idas/C_openmp/CMakeLists.txt
+index 1c7069a..582d36c 100644
+--- a/examples/idas/C_openmp/CMakeLists.txt
++++ b/examples/idas/C_openmp/CMakeLists.txt
+@@ -20,14 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for IDAS OpenMP examples
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+ # Add variable IDAS_examples_OMP with the names of the openmp IDAS examples
+ SET(IDAS_examples_OMP
+ idasFoodWeb_bnd_omp
+ idasFoodWeb_kry_omp
+ )
+-ENDIF(OPENMP_FOUND)
+
+ SET(IDAS_LIB sundials_idas)
+ SET(NVECOMP_LIB sundials_nvecopenmp)
+diff --git a/examples/kinsol/C_openmp/CMakeLists.txt b/examples/kinsol/C_openmp/CMakeLists.txt
+index f507c59..df36d1f 100644
+--- a/examples/kinsol/C_openmp/CMakeLists.txt
++++ b/examples/kinsol/C_openmp/CMakeLists.txt
+@@ -20,16 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for KINSOL OpenMP examples
+
+-# Only include tests if OpenMP is enabled
+-IF(OPENMP_FOUND)
+-
+ # Add variable KINSOL_examples_OMP with the names of the openmp KINSOL examples
+ SET(KINSOL_examples_OMP
+ kinFoodWeb_kry_omp
+ )
+
+-ENDIF(OPENMP_FOUND)
+-
+ SET(KINSOL_LIB sundials_kinsol)
+ SET(NVECOMP_LIB sundials_nvecopenmp)
+
+diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
+index 7c1ab91..cb75ec6 100644
+--- a/examples/nvector/C_openmp/CMakeLists.txt
++++ b/examples/nvector/C_openmp/CMakeLists.txt
+@@ -36,12 +36,10 @@ SET(NVECS_LIB sundials_nvecopenmp)
+
+ SET(SUNDIALS_LIBS ${NVECS_LIB} ${EXTRA_LINK_LIBS})
+
+-IF(OPENMP_FOUND)
+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+- # Use C flags for linker as well.
+- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+-ENDIF(OPENMP_FOUND)
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
++# Use C flags for linker as well.
++SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+
+ # Add the build and install targets for each nvector example
+
diff --git a/debian/patches/0007-libraries-now-link-with-libklu.patch b/debian/patches/0007-libraries-now-link-with-libklu.patch
deleted file mode 100644
index e974370..0000000
--- a/debian/patches/0007-libraries-now-link-with-libklu.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 2 Apr 2017 19:30:55 -0700
-Subject: libraries now link with libklu
-
-Many of the DSOs we make use liblku symbols, so tey should link against it
----
- src/arkode/CMakeLists.txt | 4 ++++
- src/cvode/CMakeLists.txt | 4 ++++
- src/cvodes/CMakeLists.txt | 4 ++++
- src/ida/CMakeLists.txt | 4 ++++
- src/idas/CMakeLists.txt | 4 ++++
- src/kinsol/CMakeLists.txt | 4 ++++
- 6 files changed, 24 insertions(+)
-
-diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
-index 4bc9e54..a92f4f8 100644
---- a/src/arkode/CMakeLists.txt
-+++ b/src/arkode/CMakeLists.txt
-@@ -138,6 +138,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_arkode_shared SHARED
- ${arkode_SOURCES} ${arkode_BL_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_arkode_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_arkode_shared
- PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
-diff --git a/src/cvode/CMakeLists.txt b/src/cvode/CMakeLists.txt
-index 0ef4d98..c6238c9 100644
---- a/src/cvode/CMakeLists.txt
-+++ b/src/cvode/CMakeLists.txt
-@@ -145,6 +145,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_cvode_shared SHARED
- ${cvode_SOURCES} ${cvode_BL_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_cvode_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_cvode_shared
- PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
-diff --git a/src/cvodes/CMakeLists.txt b/src/cvodes/CMakeLists.txt
-index 7cc3740..ce734af 100644
---- a/src/cvodes/CMakeLists.txt
-+++ b/src/cvodes/CMakeLists.txt
-@@ -132,6 +132,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_cvodes_shared SHARED
- ${cvodes_SOURCES} ${cvodes_BL_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_cvodes_shared
- PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
-diff --git a/src/ida/CMakeLists.txt b/src/ida/CMakeLists.txt
-index 63451cf..6b4aaa0 100644
---- a/src/ida/CMakeLists.txt
-+++ b/src/ida/CMakeLists.txt
-@@ -135,6 +135,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_ida_shared SHARED
- ${ida_SOURCES} ${ida_BL_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_ida_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_ida_shared
- PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
-diff --git a/src/idas/CMakeLists.txt b/src/idas/CMakeLists.txt
-index 113b188..231eb9f 100644
---- a/src/idas/CMakeLists.txt
-+++ b/src/idas/CMakeLists.txt
-@@ -137,6 +137,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_idas_shared SHARED
- ${idas_SOURCES} ${idas_BL_SOURCES} ${idas_SLU_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_idas_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_idas_shared
- PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
-diff --git a/src/kinsol/CMakeLists.txt b/src/kinsol/CMakeLists.txt
-index e28ad0e..17fe2e4 100644
---- a/src/kinsol/CMakeLists.txt
-+++ b/src/kinsol/CMakeLists.txt
-@@ -145,6 +145,10 @@ IF(BUILD_SHARED_LIBS)
- ADD_LIBRARY(sundials_kinsol_shared SHARED
- ${kinsol_SOURCES} ${kinsol_BL_SOURCES} ${kinsol_SLU_SOURCES} ${kinsol_KLU_SOURCES} ${shared_SOURCES})
-
-+ IF(KLU_FOUND)
-+ TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lklu)
-+ ENDIF(KLU_FOUND)
-+
- # Set the library name and make sure it is not deleted
- SET_TARGET_PROPERTIES(sundials_kinsol_shared
- PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
diff --git a/debian/patches/0008-Examples-MPI-examples-use-MPI-compiler-wrappers.patch b/debian/patches/0008-Examples-MPI-examples-use-MPI-compiler-wrappers.patch
new file mode 100644
index 0000000..82d0a24
--- /dev/null
+++ b/debian/patches/0008-Examples-MPI-examples-use-MPI-compiler-wrappers.patch
@@ -0,0 +1,701 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 21 May 2017 20:49:47 -0700
+Subject: Examples: MPI examples use MPI compiler wrappers
+
+---
+ examples/arkode/CXX_parallel/CMakeLists.txt | 5 +++++
+ examples/arkode/CXX_serial/CMakeLists.txt | 5 +++++
+ examples/arkode/C_openmp/CMakeLists.txt | 5 +++++
+ examples/arkode/C_parallel/CMakeLists.txt | 5 +++++
+ examples/arkode/C_parhyp/CMakeLists.txt | 4 ++++
+ examples/arkode/C_serial/CMakeLists.txt | 5 +++++
+ examples/arkode/F77_parallel/CMakeLists.txt | 5 +++++
+ examples/arkode/F77_serial/CMakeLists.txt | 5 +++++
+ examples/arkode/F90_parallel/CMakeLists.txt | 5 +++++
+ examples/arkode/F90_serial/CMakeLists.txt | 5 +++++
+ examples/cvode/C_openmp/CMakeLists.txt | 5 +++++
+ examples/cvode/fcmix_parallel/CMakeLists.txt | 5 +++++
+ examples/cvode/fcmix_serial/CMakeLists.txt | 5 +++++
+ examples/cvode/parallel/CMakeLists.txt | 5 +++++
+ examples/cvode/parhyp/CMakeLists.txt | 4 ++++
+ examples/cvode/serial/CMakeLists.txt | 5 +++++
+ examples/cvodes/C_openmp/CMakeLists.txt | 5 +++++
+ examples/cvodes/parallel/CMakeLists.txt | 5 +++++
+ examples/cvodes/serial/CMakeLists.txt | 5 +++++
+ examples/ida/C_openmp/CMakeLists.txt | 5 +++++
+ examples/ida/fcmix_openmp/CMakeLists.txt | 5 +++++
+ examples/ida/fcmix_parallel/CMakeLists.txt | 5 +++++
+ examples/ida/fcmix_pthreads/CMakeLists.txt | 5 +++++
+ examples/ida/fcmix_serial/CMakeLists.txt | 5 +++++
+ examples/ida/parallel/CMakeLists.txt | 5 +++++
+ examples/ida/petsc/CMakeLists.txt | 5 +++++
+ examples/ida/serial/CMakeLists.txt | 5 +++++
+ examples/idas/C_openmp/CMakeLists.txt | 5 +++++
+ examples/idas/parallel/CMakeLists.txt | 5 +++++
+ examples/idas/serial/CMakeLists.txt | 5 +++++
+ examples/kinsol/C_openmp/CMakeLists.txt | 5 +++++
+ examples/kinsol/fcmix_parallel/CMakeLists.txt | 5 +++++
+ examples/kinsol/fcmix_serial/CMakeLists.txt | 5 +++++
+ examples/kinsol/parallel/CMakeLists.txt | 5 +++++
+ examples/kinsol/serial/CMakeLists.txt | 5 +++++
+ examples/nvector/C_openmp/CMakeLists.txt | 5 +++++
+ examples/nvector/parallel/CMakeLists.txt | 5 +++++
+ examples/nvector/parhyp/CMakeLists.txt | 4 ++++
+ examples/nvector/petsc/CMakeLists.txt | 5 +++++
+ examples/nvector/pthreads/CMakeLists.txt | 5 +++++
+ examples/nvector/serial/CMakeLists.txt | 5 +++++
+ 41 files changed, 202 insertions(+)
+
+diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt
+index 658a7ef..a67a51c 100644
+--- a/examples/arkode/CXX_parallel/CMakeLists.txt
++++ b/examples/arkode/CXX_parallel/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE C++ parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable ARKODE_examples with the names of the parallel ARKODE examples
+
+diff --git a/examples/arkode/CXX_serial/CMakeLists.txt b/examples/arkode/CXX_serial/CMakeLists.txt
+index ee8ee75..b89c9ab 100644
+--- a/examples/arkode/CXX_serial/CMakeLists.txt
++++ b/examples/arkode/CXX_serial/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable ARKODE_examples with the names of the serial ARKODE examples
+
+ SET(ARKODE_examples
+diff --git a/examples/arkode/C_openmp/CMakeLists.txt b/examples/arkode/C_openmp/CMakeLists.txt
+index 6f98297..f1f5a58 100644
+--- a/examples/arkode/C_openmp/CMakeLists.txt
++++ b/examples/arkode/C_openmp/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE OpenMP examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable ARKode_examples_OMP with the names of the openmp ARKode examples
+ SET(ARKODE_examples_OMP
+ ark_brusselator1D_omp
+diff --git a/examples/arkode/C_parallel/CMakeLists.txt b/examples/arkode/C_parallel/CMakeLists.txt
+index ed99c55..ce4b7a6 100644
+--- a/examples/arkode/C_parallel/CMakeLists.txt
++++ b/examples/arkode/C_parallel/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE parallel C examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable ARKODE_examples with the names of the parallel ARKODE examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
+index faa6811..3546c6a 100644
+--- a/examples/arkode/C_parhyp/CMakeLists.txt
++++ b/examples/arkode/C_parhyp/CMakeLists.txt
+@@ -20,6 +20,10 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE parhyp C examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
+
+ # Add variable ARKODE_examples with the names of the parhyp ARKODE examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/arkode/C_serial/CMakeLists.txt b/examples/arkode/C_serial/CMakeLists.txt
+index 3eb4722..5a42e67 100644
+--- a/examples/arkode/C_serial/CMakeLists.txt
++++ b/examples/arkode/C_serial/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for ARKODE serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable ARKODE_examples with the names of the serial ARKODE examples
+
+ SET(ARKODE_examples
+diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
+index 7582bd0..74ad510 100644
+--- a/examples/arkode/F77_parallel/CMakeLists.txt
++++ b/examples/arkode/F77_parallel/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the FARKODE parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable FARKODE_examples with the names of the parallel ARKODE examples
+
+diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
+index b8a1978..3dc3d95 100644
+--- a/examples/arkode/F77_serial/CMakeLists.txt
++++ b/examples/arkode/F77_serial/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the FARKODE F77 serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable FARKODE_examples with the names of the serial FARKODE examples
+
+diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
+index ed989f2..a2b1774 100644
+--- a/examples/arkode/F90_parallel/CMakeLists.txt
++++ b/examples/arkode/F90_parallel/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the ARKODE parallel F90 examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable FARKODE_examples with the names of the parallel ARKODE examples
+
+diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
+index c2e706d..b4e4d6a 100644
+--- a/examples/arkode/F90_serial/CMakeLists.txt
++++ b/examples/arkode/F90_serial/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the FARKODE serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable FARKODE_examples with the names of the serial FARKODE examples
+
+diff --git a/examples/cvode/C_openmp/CMakeLists.txt b/examples/cvode/C_openmp/CMakeLists.txt
+index ad66f14..71c65dc 100644
+--- a/examples/cvode/C_openmp/CMakeLists.txt
++++ b/examples/cvode/C_openmp/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for CVODE OpenMP examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable CVODE_examples_OMP with the names of the openmp CVODE examples
+ SET(CVODE_examples_OMP
+ cvAdvDiff_bnd_omp
+diff --git a/examples/cvode/fcmix_parallel/CMakeLists.txt b/examples/cvode/fcmix_parallel/CMakeLists.txt
+index 2430dea..f6e6ac0 100644
+--- a/examples/cvode/fcmix_parallel/CMakeLists.txt
++++ b/examples/cvode/fcmix_parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FCVODE parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable FCVODE_examples with the names of the parallel CVODE examples
+
+diff --git a/examples/cvode/fcmix_serial/CMakeLists.txt b/examples/cvode/fcmix_serial/CMakeLists.txt
+index 0675ad4..f1b1dce 100644
+--- a/examples/cvode/fcmix_serial/CMakeLists.txt
++++ b/examples/cvode/fcmix_serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FCVODE serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable FCVODE_examples with the names of the serial FCVODE examples
+
+diff --git a/examples/cvode/parallel/CMakeLists.txt b/examples/cvode/parallel/CMakeLists.txt
+index 9381ee3..15f20ab 100644
+--- a/examples/cvode/parallel/CMakeLists.txt
++++ b/examples/cvode/parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for CVODE parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable CVODE_examples with the names of the parallel CVODE examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/cvode/parhyp/CMakeLists.txt b/examples/cvode/parhyp/CMakeLists.txt
+index bd4d6b9..a05c166 100644
+--- a/examples/cvode/parhyp/CMakeLists.txt
++++ b/examples/cvode/parhyp/CMakeLists.txt
+@@ -16,6 +16,10 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for CVODE parhyp examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
+
+ # Add variable CVODE_examples with the names of the parhyp CVODE examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/cvode/serial/CMakeLists.txt b/examples/cvode/serial/CMakeLists.txt
+index 52a97e7..222d407 100644
+--- a/examples/cvode/serial/CMakeLists.txt
++++ b/examples/cvode/serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for CVODE serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable CVODE_examples with the names of the serial CVODE examples
+
+ SET(CVODE_examples
+diff --git a/examples/cvodes/C_openmp/CMakeLists.txt b/examples/cvodes/C_openmp/CMakeLists.txt
+index 7c9b9a0..e778841 100644
+--- a/examples/cvodes/C_openmp/CMakeLists.txt
++++ b/examples/cvodes/C_openmp/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for CVODES OpenMP examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable CVODES_examples_OMP with the names of the openmp CVODES examples
+ SET(CVODES_examples_OMP
+ cvsAdvDiff_bnd_omp
+diff --git a/examples/cvodes/parallel/CMakeLists.txt b/examples/cvodes/parallel/CMakeLists.txt
+index 1b80a87..109ec7b 100644
+--- a/examples/cvodes/parallel/CMakeLists.txt
++++ b/examples/cvodes/parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the CVODES parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable CVODES_examples with the names of the parallel CVODES examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/cvodes/serial/CMakeLists.txt b/examples/cvodes/serial/CMakeLists.txt
+index d5403f1..22c4b16 100644
+--- a/examples/cvodes/serial/CMakeLists.txt
++++ b/examples/cvodes/serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for CVODES serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable CVODES_examples with the names of the serial CVODES examples
+ # This is a list of tuples, first element is example name.
+ # Optional second argument is test arguments
+diff --git a/examples/ida/C_openmp/CMakeLists.txt b/examples/ida/C_openmp/CMakeLists.txt
+index 99d8738..1c42b4f 100644
+--- a/examples/ida/C_openmp/CMakeLists.txt
++++ b/examples/ida/C_openmp/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the IDA OpenMP examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable ida_examples with the names of the openmp IDA examples
+ SET(IDA_examples
+diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
+index df23c02..1cb511b 100644
+--- a/examples/ida/fcmix_openmp/CMakeLists.txt
++++ b/examples/ida/fcmix_openmp/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA opemp examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable ida_examples with the names of the openmp FIDA examples
+ SET(FIDA_examples
+diff --git a/examples/ida/fcmix_parallel/CMakeLists.txt b/examples/ida/fcmix_parallel/CMakeLists.txt
+index 278bc8d..15c1a34 100644
+--- a/examples/ida/fcmix_parallel/CMakeLists.txt
++++ b/examples/ida/fcmix_parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable ida_examples with the names of the parallel IDA examples
+
+diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
+index cf055b9..111e99f 100644
+--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
++++ b/examples/ida/fcmix_pthreads/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA opemp examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Only include tests if Pthreads is enabled
+ IF(PTHREADS_FOUND)
+diff --git a/examples/ida/fcmix_serial/CMakeLists.txt b/examples/ida/fcmix_serial/CMakeLists.txt
+index acb4437..433b681 100644
+--- a/examples/ida/fcmix_serial/CMakeLists.txt
++++ b/examples/ida/fcmix_serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable ida_examples with the names of the serial FIDA examples
+
+diff --git a/examples/ida/parallel/CMakeLists.txt b/examples/ida/parallel/CMakeLists.txt
+index 6324668..d94c414 100644
+--- a/examples/ida/parallel/CMakeLists.txt
++++ b/examples/ida/parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for IDA parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable IDA_examples with the names of the parallel IDA examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/ida/petsc/CMakeLists.txt b/examples/ida/petsc/CMakeLists.txt
+index 5934ac0..5a4547a 100644
+--- a/examples/ida/petsc/CMakeLists.txt
++++ b/examples/ida/petsc/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for IDA PETSc examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable IDA_examples with the names of the PETSc IDA examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/ida/serial/CMakeLists.txt b/examples/ida/serial/CMakeLists.txt
+index 8400927..0eb6806 100644
+--- a/examples/ida/serial/CMakeLists.txt
++++ b/examples/ida/serial/CMakeLists.txt
+@@ -19,6 +19,11 @@
+ # CSW 4/19/2014
+ # Added SUPERLUMT logic.
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable IDA_examples with the names of the serial IDA examples
+
+diff --git a/examples/idas/C_openmp/CMakeLists.txt b/examples/idas/C_openmp/CMakeLists.txt
+index 582d36c..8539e2d 100644
+--- a/examples/idas/C_openmp/CMakeLists.txt
++++ b/examples/idas/C_openmp/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for IDAS OpenMP examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable IDAS_examples_OMP with the names of the openmp IDAS examples
+ SET(IDAS_examples_OMP
+ idasFoodWeb_bnd_omp
+diff --git a/examples/idas/parallel/CMakeLists.txt b/examples/idas/parallel/CMakeLists.txt
+index 404da62..6546f1c 100644
+--- a/examples/idas/parallel/CMakeLists.txt
++++ b/examples/idas/parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for IDAS parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable IDAS_examples with the names of the parallel IDAS examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/idas/serial/CMakeLists.txt b/examples/idas/serial/CMakeLists.txt
+index 959fbc6..8c12b83 100644
+--- a/examples/idas/serial/CMakeLists.txt
++++ b/examples/idas/serial/CMakeLists.txt
+@@ -19,6 +19,11 @@
+ # LEBanks 3/25/2013
+ # Added SUPERLUMT logic.
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable IDAS_examples with the names of the serial IDAS examples
+
+diff --git a/examples/kinsol/C_openmp/CMakeLists.txt b/examples/kinsol/C_openmp/CMakeLists.txt
+index df36d1f..c1ed518 100644
+--- a/examples/kinsol/C_openmp/CMakeLists.txt
++++ b/examples/kinsol/C_openmp/CMakeLists.txt
+@@ -20,6 +20,11 @@
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for KINSOL OpenMP examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable KINSOL_examples_OMP with the names of the openmp KINSOL examples
+ SET(KINSOL_examples_OMP
+ kinFoodWeb_kry_omp
+diff --git a/examples/kinsol/fcmix_parallel/CMakeLists.txt b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+index 96ab441..50fe5e0 100644
+--- a/examples/kinsol/fcmix_parallel/CMakeLists.txt
++++ b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FKINSOL parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable kinsol_examples with the names of the parallel KINSOL examples
+
+diff --git a/examples/kinsol/fcmix_serial/CMakeLists.txt b/examples/kinsol/fcmix_serial/CMakeLists.txt
+index 7dee897..58b60cc 100644
+--- a/examples/kinsol/fcmix_serial/CMakeLists.txt
++++ b/examples/kinsol/fcmix_serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FKINSOL serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable kinsol_examples with the names of the serial FKINSOL examples
+
+diff --git a/examples/kinsol/parallel/CMakeLists.txt b/examples/kinsol/parallel/CMakeLists.txt
+index 9b78e60..8f38c7e 100644
+--- a/examples/kinsol/parallel/CMakeLists.txt
++++ b/examples/kinsol/parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for KINSOL parallel examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable KINSOL_examples with the names of the parallel KINSOL examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/kinsol/serial/CMakeLists.txt b/examples/kinsol/serial/CMakeLists.txt
+index f0d0912..81ba210 100644
+--- a/examples/kinsol/serial/CMakeLists.txt
++++ b/examples/kinsol/serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for KINSOL serial examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+
+ # Add variable KINSOL_examples with the names of the serial KINSOL examples
+
+diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
+index cb75ec6..766a275 100644
+--- a/examples/nvector/C_openmp/CMakeLists.txt
++++ b/examples/nvector/C_openmp/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for nvector examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable nvector_openmp_examples with the names of the nvector examples
+
+ SET(nvector_openmp_examples
+diff --git a/examples/nvector/parallel/CMakeLists.txt b/examples/nvector/parallel/CMakeLists.txt
+index 37dd1b1..5331d1e 100644
+--- a/examples/nvector/parallel/CMakeLists.txt
++++ b/examples/nvector/parallel/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for nvector examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable nvector_parallel_examples with the names of the nvector examples
+
+ SET(nvector_parallel_examples
+diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
+index 8c6e605..fbfe8ea 100644
+--- a/examples/nvector/parhyp/CMakeLists.txt
++++ b/examples/nvector/parhyp/CMakeLists.txt
+@@ -16,6 +16,10 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for nvector examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
+ # Add variable nvector_parhyp_examples with the names of the nvector examples
+
+ SET(nvector_parhyp_examples
+diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
+index afa09fb..d155eea 100644
+--- a/examples/nvector/petsc/CMakeLists.txt
++++ b/examples/nvector/petsc/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for nvector examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable nvector_petsc_examples with the names of the nvector examples
+
+ SET(nvector_petsc_examples
+diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
+index 1c171c8..68c768d 100644
+--- a/examples/nvector/pthreads/CMakeLists.txt
++++ b/examples/nvector/pthreads/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for nvector examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable nvector_pthreads_examples with the names of the nvector examples
+
+ SET(nvector_pthreads_examples
+diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
+index 9b0afe9..2d897ca 100644
+--- a/examples/nvector/serial/CMakeLists.txt
++++ b/examples/nvector/serial/CMakeLists.txt
+@@ -16,6 +16,11 @@
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for nvector examples
+
++set( MPI_MPICC "mpicc" )
++set( MPI_MPICXX "mpicxx" )
++set( MPI_MPIF77 "mpif77")
++set( MPI_MPIF90 "mpif90")
++
+ # Add variable nvector_serial_examples with the names of the nvector examples
+
+ SET(nvector_serial_examples
diff --git a/debian/patches/0008-patched-findPETSc.patch b/debian/patches/0008-patched-findPETSc.patch
deleted file mode 100644
index 6e1480a..0000000
--- a/debian/patches/0008-patched-findPETSc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 2 Apr 2017 19:37:27 -0700
-Subject: patched findPETSc
-
----
- config/FindPETSc.cmake | 44 +++++++++-----------------------------------
- 1 file changed, 9 insertions(+), 35 deletions(-)
-
-diff --git a/config/FindPETSc.cmake b/config/FindPETSc.cmake
-index 5fb3e56..9ef86e2 100644
---- a/config/FindPETSc.cmake
-+++ b/config/FindPETSc.cmake
-@@ -1,52 +1,26 @@
--# ---------------------------------------------------------------
--# $Revision: $
--# $Date: $
--# ---------------------------------------------------------------
--# Programmer: Steven Smith @ LLNL
--# ---------------------------------------------------------------
--# LLNS Copyright Start
--# Copyright (c) 2014, Lawrence Livermore National Security
--# This work was performed under the auspices of the U.S. Department
--# of Energy by Lawrence Livermore National Laboratory in part under
--# Contract W-7405-Eng-48 and in part under Contract DE-AC52-07NA27344.
--# Produced at the Lawrence Livermore National Laboratory.
--# All rights reserved.
--# For details, see the LICENSE file.
--# LLNS Copyright End
--# ---------------------------------------------------------------
--# Find PETSC library.
--#
--
- find_package(PkgConfig)
-
- IF(WIN32)
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
- endif(WIN32)
--pkg_check_modules(PC_PETSC QUIET PETSc)
-
-+# Need PETSc and MPI. Linker should be able to find MPI as is
-+pkg_check_modules(PC_PETSC REQUIRED PETSc)
- find_path(PETSC_INCLUDE_DIR petsc.h
- HINTS ${PC_PETSC_INCLUDEDIR} ${PC_PETSC_INCLUDE_DIRS}
- PATHS PETSC_INCLUDE_DIR
- )
--
- find_library(PETSC_LIBRARY NAMES petsc
- HINTS ${PC_PETSC_LIBDIR} ${PC_PETSC_LIBRARY_DIRS} )
-
--include(CheckCSourceRuns)
--set(CMAKE_REQUIRED_INCLUDES ${PETSC_INCLUDE_DIR})
--set(CMAKE_REQUIRED_LIBRARIES ${PETSC_LIBRARY})
--check_c_source_runs(
-- "\#include \"petscvec.h\"\nint main(){Vec x;VecCreate(PETSC_COMM_WORLD, &x);return(0);}"
-- PETSC_BUILD_STATUS
--)
--
--include(FindPackageHandleStandardArgs)
--# handle the QUIETLY and REQUIRED arguments and set PETSC_FOUND to TRUE
--# if all listed variables are TRUE
--find_package_handle_standard_args(PETSc DEFAULT_MSG
-- PETSC_LIBRARY PETSC_INCLUDE_DIR PETSC_BUILD_STATUS)
-+pkg_check_modules(PC_MPI REQUIRED ompi-c)
-+find_path(MPI_INCLUDE_DIR mpi.h
-+ HINTS ${PC_MPI_INCLUDEDIR} ${PC_MPI_INCLUDE_DIRS}
-+ PATHS MPI_INCLUDE_DIR
-+ )
-
- mark_as_advanced(PETSC_INCLUDE_DIR PETSC_LIBRARY )
-
- set(PETSC_LIBRARIES ${PETSC_LIBRARY} )
--set(PETSC_INCLUDE_DIRS ${PETSC_INCLUDE_DIR} )
-+set(PETSC_INCLUDE_DIRS ${PC_PETSC_INCLUDE_DIRS} ${MPI_INCLUDE_DIR})
-+set(PETSC_FOUND TRUE)
diff --git a/debian/patches/0009-Examples-HYPRE-examples-build-with-hypre-libraries-a.patch b/debian/patches/0009-Examples-HYPRE-examples-build-with-hypre-libraries-a.patch
new file mode 100644
index 0000000..05c86a7
--- /dev/null
+++ b/debian/patches/0009-Examples-HYPRE-examples-build-with-hypre-libraries-a.patch
@@ -0,0 +1,70 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 21 May 2017 21:18:05 -0700
+Subject: Examples: HYPRE examples build with hypre libraries as needed
+
+---
+ examples/arkode/C_parhyp/CMakeLists.txt | 5 +++++
+ examples/cvode/parhyp/CMakeLists.txt | 9 ++++++---
+ examples/nvector/parhyp/CMakeLists.txt | 6 ++++++
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/examples/arkode/C_parhyp/CMakeLists.txt b/examples/arkode/C_parhyp/CMakeLists.txt
+index 3546c6a..345b575 100644
+--- a/examples/arkode/C_parhyp/CMakeLists.txt
++++ b/examples/arkode/C_parhyp/CMakeLists.txt
+@@ -25,6 +25,11 @@ set( MPI_MPICXX "mpicxx" )
+ set( MPI_MPIF77 "mpif77")
+ set( MPI_MPIF90 "mpif90")
+
++INCLUDE_DIRECTORIES( "/usr/include/hypre" )
++# hypre examples use HYPRE_IJ_mv directly so I must link with it
++SET(HYPRE_LIBRARIES ${HYPRE_LIBRARIES} "-lHYPRE_IJ_mv")
++
++
+ # Add variable ARKODE_examples with the names of the parhyp ARKODE examples
+ # "name\;nodes\;tasks"
+ SET(ARKODE_examples
+diff --git a/examples/cvode/parhyp/CMakeLists.txt b/examples/cvode/parhyp/CMakeLists.txt
+index a05c166..3e6d80b 100644
+--- a/examples/cvode/parhyp/CMakeLists.txt
++++ b/examples/cvode/parhyp/CMakeLists.txt
+@@ -21,6 +21,11 @@ set( MPI_MPICXX "mpicxx" )
+ set( MPI_MPIF77 "mpif77")
+ set( MPI_MPIF90 "mpif90")
+
++INCLUDE_DIRECTORIES( "/usr/include/hypre" )
++# hypre examples use HYPRE_IJ_mv directly so I must link with it
++SET(HYPRE_LIBRARIES ${HYPRE_LIBRARIES} "-lHYPRE_IJ_mv")
++
++
+ # Add variable CVODE_examples with the names of the parhyp CVODE examples
+ # "name\;nodes\;tasks"
+ SET(CVODE_examples
+@@ -60,9 +65,7 @@ IF(SUPERLUMT_FOUND)
+ LIST(APPEND SUNDIALS_LIBS ${SUPERLUMT_LIBRARIES})
+ ENDIF(SUPERLUMT_FOUND)
+
+-IF(HYPRE_FOUND)
+- LIST(APPEND SUNDIALS_LIBS ${HYPRE_LIBRARIES})
+-ENDIF(HYPRE_FOUND)
++LIST(APPEND SUNDIALS_LIBS ${HYPRE_LIBRARIES})
+
+ # Add the build and install targets for each CVODE example
+
+diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
+index fbfe8ea..717dc0f 100644
+--- a/examples/nvector/parhyp/CMakeLists.txt
++++ b/examples/nvector/parhyp/CMakeLists.txt
+@@ -20,6 +20,12 @@ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+ set( MPI_MPIF77 "mpif77")
+ set( MPI_MPIF90 "mpif90")
++
++INCLUDE_DIRECTORIES( "/usr/include/hypre" )
++# This hypre example uses HYPRE_utilities and HYPRE_parcsr_mv directly so I must
++# link with it
++SET(HYPRE_LIBRARIES ${HYPRE_LIBRARIES} "-lHYPRE_utilities" "-lHYPRE_parcsr_mv")
++
+ # Add variable nvector_parhyp_examples with the names of the nvector examples
+
+ SET(nvector_parhyp_examples
diff --git a/debian/patches/0010-Examples-can-find-the-PETSc-library.patch b/debian/patches/0010-Examples-can-find-the-PETSc-library.patch
new file mode 100644
index 0000000..ae823ee
--- /dev/null
+++ b/debian/patches/0010-Examples-can-find-the-PETSc-library.patch
@@ -0,0 +1,45 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 21 May 2017 22:12:38 -0700
+Subject: Examples can find the PETSc library
+
+---
+ examples/ida/petsc/CMakeLists.txt | 7 +++++++
+ examples/nvector/petsc/CMakeLists.txt | 7 +++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/examples/ida/petsc/CMakeLists.txt b/examples/ida/petsc/CMakeLists.txt
+index 5a4547a..94a3b64 100644
+--- a/examples/ida/petsc/CMakeLists.txt
++++ b/examples/ida/petsc/CMakeLists.txt
+@@ -21,6 +21,13 @@ set( MPI_MPICXX "mpicxx" )
+ set( MPI_MPIF77 "mpif77")
+ set( MPI_MPIF90 "mpif90")
+
++find_package(PkgConfig)
++pkg_check_modules(PC_PETSC REQUIRED PETSc)
++find_library(PETSC_LIBRARY NAMES petsc
++ HINTS ${PC_PETSC_LIBDIR} ${PC_PETSC_LIBRARY_DIRS} )
++set(PETSC_LIBRARIES ${PETSC_LIBRARY} )
++INCLUDE_DIRECTORIES( ${PC_PETSC_INCLUDEDIR} ${PC_PETSC_INCLUDE_DIRS} )
++
+
+ # Add variable IDA_examples with the names of the PETSc IDA examples
+ # "name\;nodes\;tasks"
+diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
+index d155eea..1a4087a 100644
+--- a/examples/nvector/petsc/CMakeLists.txt
++++ b/examples/nvector/petsc/CMakeLists.txt
+@@ -21,6 +21,13 @@ set( MPI_MPICXX "mpicxx" )
+ set( MPI_MPIF77 "mpif77")
+ set( MPI_MPIF90 "mpif90")
+
++find_package(PkgConfig)
++pkg_check_modules(PC_PETSC REQUIRED PETSc)
++find_library(PETSC_LIBRARY NAMES petsc
++ HINTS ${PC_PETSC_LIBDIR} ${PC_PETSC_LIBRARY_DIRS} )
++set(PETSC_LIBRARIES ${PETSC_LIBRARY} )
++INCLUDE_DIRECTORIES( ${PC_PETSC_INCLUDEDIR} ${PC_PETSC_INCLUDE_DIRS} )
++
+ # Add variable nvector_petsc_examples with the names of the nvector examples
+
+ SET(nvector_petsc_examples
diff --git a/debian/patches/0011-Examples-nvector-examples-use-shipped-copy-of-sundia.patch b/debian/patches/0011-Examples-nvector-examples-use-shipped-copy-of-sundia.patch
new file mode 100644
index 0000000..f444cc6
--- /dev/null
+++ b/debian/patches/0011-Examples-nvector-examples-use-shipped-copy-of-sundia.patch
@@ -0,0 +1,145 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 21 May 2017 22:56:24 -0700
+Subject: Examples: nvector examples: use shipped copy of sundials_nvector.c
+
+---
+ examples/nvector/C_openmp/CMakeLists.txt | 4 ++--
+ examples/nvector/parallel/CMakeLists.txt | 4 ++--
+ examples/nvector/parhyp/CMakeLists.txt | 4 ++--
+ examples/nvector/petsc/CMakeLists.txt | 4 ++--
+ examples/nvector/pthreads/CMakeLists.txt | 4 ++--
+ examples/nvector/serial/CMakeLists.txt | 4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
+index 766a275..27fc607 100644
+--- a/examples/nvector/C_openmp/CMakeLists.txt
++++ b/examples/nvector/C_openmp/CMakeLists.txt
+@@ -49,7 +49,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
+ # Add the build and install targets for each nvector example
+
+ FOREACH(example ${nvector_openmp_examples})
+- ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
++ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+
+@@ -58,7 +58,7 @@ FOREACH(example ${nvector_openmp_examples})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ IF(EXAMPLES_INSTALL)
+- INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../../../src/sundials/sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/C_openmp)
++ INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/C_openmp)
+ ENDIF(EXAMPLES_INSTALL)
+ ENDFOREACH(example ${nvector_openmp_examples})
+
+diff --git a/examples/nvector/parallel/CMakeLists.txt b/examples/nvector/parallel/CMakeLists.txt
+index 5331d1e..d88e1ba 100644
+--- a/examples/nvector/parallel/CMakeLists.txt
++++ b/examples/nvector/parallel/CMakeLists.txt
+@@ -55,7 +55,7 @@ ENDIF(MPI_MPICC)
+
+ FOREACH(example ${nvector_parallel_examples})
+
+- ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
++ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+ # Run sequentially
+@@ -69,7 +69,7 @@ FOREACH(example ${nvector_parallel_examples})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ IF(EXAMPLES_INSTALL)
+- INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../../../src/sundials/sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/parallel)
++ INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/parallel)
+ ENDIF(EXAMPLES_INSTALL)
+ ENDFOREACH(example ${nvector_parallel_examples})
+
+diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
+index 717dc0f..a8dea5e 100644
+--- a/examples/nvector/parhyp/CMakeLists.txt
++++ b/examples/nvector/parhyp/CMakeLists.txt
+@@ -64,7 +64,7 @@ ENDIF(MPI_MPICC)
+
+ FOREACH(example ${nvector_parhyp_examples})
+
+- ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
++ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+ # Run sequentially
+@@ -80,7 +80,7 @@ FOREACH(example ${nvector_parhyp_examples})
+ TARGET_LINK_LIBRARIES(${example} ${HYPRE_LIBRARIES})
+
+ IF(EXAMPLES_INSTALL)
+- INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../../../src/sundials/sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/parhyp)
++ INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/parhyp)
+ ENDIF(EXAMPLES_INSTALL)
+ ENDFOREACH(example ${nvector_parhyp_examples})
+
+diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
+index 1a4087a..5db06dc 100644
+--- a/examples/nvector/petsc/CMakeLists.txt
++++ b/examples/nvector/petsc/CMakeLists.txt
+@@ -63,7 +63,7 @@ ENDIF(MPI_MPICC)
+
+ FOREACH(example ${nvector_petsc_examples})
+
+- ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
++ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+ # Run sequentially
+@@ -78,7 +78,7 @@ FOREACH(example ${nvector_petsc_examples})
+ TARGET_LINK_LIBRARIES(${example} ${PETSC_LIBRARIES})
+
+ IF(EXAMPLES_INSTALL)
+- INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../../../src/sundials/sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/petsc)
++ INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/petsc)
+ ENDIF(EXAMPLES_INSTALL)
+ ENDFOREACH(example ${nvector_petsc_examples})
+
+diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
+index 68c768d..6c8eb1b 100644
+--- a/examples/nvector/pthreads/CMakeLists.txt
++++ b/examples/nvector/pthreads/CMakeLists.txt
+@@ -53,7 +53,7 @@ FOREACH(example ${nvector_pthreads_examples})
+ ADD_DEFINITIONS(-DBUILD_SUNDIALS_LIBRARY)
+ ENDIF(WIN32)
+
+- ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
++ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+
+@@ -64,7 +64,7 @@ FOREACH(example ${nvector_pthreads_examples})
+ TARGET_LINK_LIBRARIES(${example} ${CMAKE_THREAD_LIBS_INIT})
+
+ IF(EXAMPLES_INSTALL)
+- INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../../../src/sundials/sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/pthreads)
++ INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/pthreads)
+ ENDIF(EXAMPLES_INSTALL)
+ ENDFOREACH(example ${nvector_pthreads_examples})
+
+diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
+index 2d897ca..0076d4d 100644
+--- a/examples/nvector/serial/CMakeLists.txt
++++ b/examples/nvector/serial/CMakeLists.txt
+@@ -53,7 +53,7 @@ FOREACH(example ${nvector_serial_examples})
+ ADD_DEFINITIONS(-DBUILD_SUNDIALS_LIBRARY)
+ ENDIF(WIN32)
+
+- ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../../../src/sundials/sundials_nvector.c)
++ ADD_EXECUTABLE(${example} ${example}.c ../test_nvector.c ../sundials_nvector.c)
+ SET_TARGET_PROPERTIES(${example} PROPERTIES FOLDER "Examples")
+
+
+@@ -61,7 +61,7 @@ FOREACH(example ${nvector_serial_examples})
+ TARGET_LINK_LIBRARIES(${example} ${SUNDIALS_LIBS})
+
+ IF(EXAMPLES_INSTALL)
+- INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../../../src/sundials/sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/serial)
++ INSTALL(FILES ${example}.c ../test_nvector.c ../test_nvector.h ../sundials_nvector.c DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/serial)
+ ENDIF(EXAMPLES_INSTALL)
+ ENDFOREACH(example ${nvector_serial_examples})
+
diff --git a/debian/patches/0012-Examples-fortran-examples-CMake-knows-to-do-its-fort.patch b/debian/patches/0012-Examples-fortran-examples-CMake-knows-to-do-its-fort.patch
new file mode 100644
index 0000000..7d61ccc
--- /dev/null
+++ b/debian/patches/0012-Examples-fortran-examples-CMake-knows-to-do-its-fort.patch
@@ -0,0 +1,163 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 21 May 2017 23:45:09 -0700
+Subject: Examples: fortran examples: CMake knows to do its fortran thing
+
+---
+ examples/arkode/F77_parallel/CMakeLists.txt | 1 +
+ examples/arkode/F77_serial/CMakeLists.txt | 1 +
+ examples/arkode/F90_parallel/CMakeLists.txt | 1 +
+ examples/arkode/F90_serial/CMakeLists.txt | 1 +
+ examples/cvode/fcmix_parallel/CMakeLists.txt | 1 +
+ examples/cvode/fcmix_serial/CMakeLists.txt | 1 +
+ examples/ida/fcmix_openmp/CMakeLists.txt | 1 +
+ examples/ida/fcmix_parallel/CMakeLists.txt | 1 +
+ examples/ida/fcmix_pthreads/CMakeLists.txt | 1 +
+ examples/ida/fcmix_serial/CMakeLists.txt | 1 +
+ examples/kinsol/fcmix_parallel/CMakeLists.txt | 1 +
+ examples/kinsol/fcmix_serial/CMakeLists.txt | 1 +
+ 12 files changed, 12 insertions(+)
+
+diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
+index 74ad510..10302ea 100644
+--- a/examples/arkode/F77_parallel/CMakeLists.txt
++++ b/examples/arkode/F77_parallel/CMakeLists.txt
+@@ -19,6 +19,7 @@
+ # For details, see the LICENSE file.
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the FARKODE parallel examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
+index 3dc3d95..32426f4 100644
+--- a/examples/arkode/F77_serial/CMakeLists.txt
++++ b/examples/arkode/F77_serial/CMakeLists.txt
+@@ -19,6 +19,7 @@
+ # For details, see the LICENSE file.
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the FARKODE F77 serial examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
+index a2b1774..0712449 100644
+--- a/examples/arkode/F90_parallel/CMakeLists.txt
++++ b/examples/arkode/F90_parallel/CMakeLists.txt
+@@ -19,6 +19,7 @@
+ # For details, see the LICENSE file.
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the ARKODE parallel F90 examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
+index b4e4d6a..782fed6 100644
+--- a/examples/arkode/F90_serial/CMakeLists.txt
++++ b/examples/arkode/F90_serial/CMakeLists.txt
+@@ -19,6 +19,7 @@
+ # For details, see the LICENSE file.
+ # -----------------------------------------------------------------
+ # CMakeLists.txt file for the FARKODE serial examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/cvode/fcmix_parallel/CMakeLists.txt b/examples/cvode/fcmix_parallel/CMakeLists.txt
+index f6e6ac0..471c789 100644
+--- a/examples/cvode/fcmix_parallel/CMakeLists.txt
++++ b/examples/cvode/fcmix_parallel/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FCVODE parallel examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/cvode/fcmix_serial/CMakeLists.txt b/examples/cvode/fcmix_serial/CMakeLists.txt
+index f1b1dce..c6976f2 100644
+--- a/examples/cvode/fcmix_serial/CMakeLists.txt
++++ b/examples/cvode/fcmix_serial/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FCVODE serial examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
+index 1cb511b..8b71b94 100644
+--- a/examples/ida/fcmix_openmp/CMakeLists.txt
++++ b/examples/ida/fcmix_openmp/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA opemp examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/ida/fcmix_parallel/CMakeLists.txt b/examples/ida/fcmix_parallel/CMakeLists.txt
+index 15c1a34..36b6e95 100644
+--- a/examples/ida/fcmix_parallel/CMakeLists.txt
++++ b/examples/ida/fcmix_parallel/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA parallel examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
+index 111e99f..c9e2e31 100644
+--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
++++ b/examples/ida/fcmix_pthreads/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA opemp examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/ida/fcmix_serial/CMakeLists.txt b/examples/ida/fcmix_serial/CMakeLists.txt
+index 433b681..8701a27 100644
+--- a/examples/ida/fcmix_serial/CMakeLists.txt
++++ b/examples/ida/fcmix_serial/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FIDA serial examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/kinsol/fcmix_parallel/CMakeLists.txt b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+index 50fe5e0..d291432 100644
+--- a/examples/kinsol/fcmix_parallel/CMakeLists.txt
++++ b/examples/kinsol/fcmix_parallel/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FKINSOL parallel examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
+diff --git a/examples/kinsol/fcmix_serial/CMakeLists.txt b/examples/kinsol/fcmix_serial/CMakeLists.txt
+index 58b60cc..008c9fc 100644
+--- a/examples/kinsol/fcmix_serial/CMakeLists.txt
++++ b/examples/kinsol/fcmix_serial/CMakeLists.txt
+@@ -15,6 +15,7 @@
+ # LLNS Copyright End
+ # ---------------------------------------------------------------
+ # CMakeLists.txt file for the FKINSOL serial examples
++enable_language(Fortran)
+
+ set( MPI_MPICC "mpicc" )
+ set( MPI_MPICXX "mpicxx" )
diff --git a/debian/patches/0013-Examples-pthread-example-assumes-we-have-pthread-sup.patch b/debian/patches/0013-Examples-pthread-example-assumes-we-have-pthread-sup.patch
new file mode 100644
index 0000000..7b79f20
--- /dev/null
+++ b/debian/patches/0013-Examples-pthread-example-assumes-we-have-pthread-sup.patch
@@ -0,0 +1,30 @@
+From: Dima Kogan <dima at secretsauce.net>
+Date: Sun, 21 May 2017 23:45:31 -0700
+Subject: Examples: pthread example assumes we have pthread support
+
+---
+ examples/ida/fcmix_pthreads/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
+index c9e2e31..5b0499e 100644
+--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
++++ b/examples/ida/fcmix_pthreads/CMakeLists.txt
+@@ -23,9 +23,6 @@ set( MPI_MPIF77 "mpif77")
+ set( MPI_MPIF90 "mpif90")
+
+
+-# Only include tests if Pthreads is enabled
+-IF(PTHREADS_FOUND)
+-
+ # Add variable ida_examples with the names of the pthreads FIDA examples
+ SET(FIDA_examples
+ fidaRoberts_dns_pthreads
+@@ -36,7 +33,6 @@ SET(FIDA_examples
+
+ SET(FIDA_examples_BL
+ )
+-ENDIF(PTHREADS_FOUND)
+
+ SET(IDA_LIB sundials_ida)
+ SET(NVECS_LIB sundials_nvecpthreads)
diff --git a/debian/patches/series b/debian/patches/series
index cb0d549..7e238ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,13 @@
0001-Added-missing-linkages-to-the-DSOs.patch
0002-Fix-library-paths-for-multiarch.patch
-0003-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
-0004-arkode-examples-use-default-sundials-libraries.patch
-0005-arkode-examples-don-t-call-SUNDIALS_ADD_TEST.patch
-0006-example-added-forgotten-library-linkage.patch
-0007-libraries-now-link-with-libklu.patch
-0008-patched-findPETSc.patch
+0003-PETSc-is-now-findable-by-CMake.patch
+0004-Examples-use-default-sundials-libraries.patch
+0005-Examples-don-t-call-SUNDIALS_ADD_TEST.patch
+0006-Examples-link-with-lm.patch
+0007-Examples-OpenMP-examples-assume-that-we-HAVE-OpenMP.patch
+0008-Examples-MPI-examples-use-MPI-compiler-wrappers.patch
+0009-Examples-HYPRE-examples-build-with-hypre-libraries-a.patch
+0010-Examples-can-find-the-PETSc-library.patch
+0011-Examples-nvector-examples-use-shipped-copy-of-sundia.patch
+0012-Examples-fortran-examples-CMake-knows-to-do-its-fort.patch
+0013-Examples-pthread-example-assumes-we-have-pthread-sup.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git
More information about the debian-science-commits
mailing list