diff --git a/mingw-w64-cvode/001-install-location.patch b/mingw-w64-cvode/001-install-location.patch
new file mode 100644
index 0000000000..995f7185c3
--- /dev/null
+++ b/mingw-w64-cvode/001-install-location.patch
@@ -0,0 +1,465 @@
+diff -Naur cvode-3.2.1-orig/CMakeLists.txt cvode-3.2.1/CMakeLists.txt
+--- cvode-3.2.1-orig/CMakeLists.txt	2018-10-11 22:22:09.000000000 +0300
++++ cvode-3.2.1/CMakeLists.txt	2018-11-03 09:04:01.252588600 +0300
+@@ -554,12 +554,12 @@
+   IF(EXAMPLES_INSTALL)
+ 
+     SHOW_VARIABLE(EXAMPLES_INSTALL_PATH PATH
+-      "Output directory for installing example files" "${CMAKE_INSTALL_PREFIX}/examples")
++      "Output directory for installing example files" "${CMAKE_INSTALL_PREFIX}/share/sundials/examples")
+ 
+     IF(NOT EXAMPLES_INSTALL_PATH)
+       PRINT_WARNING("The example installation path is empty"
+                     "Example installation path was reset to its default value")
+-      SET(EXAMPLES_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/examples" CACHE STRING
++      SET(EXAMPLES_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/sundials/examples/" CACHE STRING
+         "Output directory for installing example files" FORCE)
+     ENDIF(NOT EXAMPLES_INSTALL_PATH)
+ 
+diff -Naur cvode-3.2.1-orig/src/cvode/CMakeLists.txt cvode-3.2.1/src/cvode/CMakeLists.txt
+--- cvode-3.2.1-orig/src/cvode/CMakeLists.txt	2018-10-11 22:22:24.000000000 +0300
++++ cvode-3.2.1/src/cvode/CMakeLists.txt	2018-11-03 09:07:58.976185600 +0300
+@@ -123,7 +123,7 @@
+     PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
+ 
+   # Install the CVODE library
+-  INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_cvode_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+diff -Naur cvode-3.2.1-orig/src/nvec_cuda/CMakeLists.txt cvode-3.2.1/src/nvec_cuda/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_cuda/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_cuda/CMakeLists.txt	2018-11-03 09:08:28.141853800 +0300
+@@ -89,7 +89,7 @@
+     SET_TARGET_PROPERTIES(sundials_nvecmpicuda_shared
+       PROPERTIES OUTPUT_NAME sundials_nvecmpicuda CLEAN_DIRECT_OUTPUT 1
+                  VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_nvecmpicuda_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_nvecmpicuda_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF()
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+diff -Naur cvode-3.2.1-orig/src/nvec_openmp/CMakeLists.txt cvode-3.2.1/src/nvec_openmp/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_openmp/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_openmp/CMakeLists.txt	2018-11-03 09:09:02.118797200 +0300
+@@ -69,7 +69,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_nvecopenmp_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECOPENMP header files
+@@ -96,7 +96,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared 
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fnvecopenmp_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/nvec_par/CMakeLists.txt cvode-3.2.1/src/nvec_par/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_par/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_par/CMakeLists.txt	2018-11-03 09:09:50.019536900 +0300
+@@ -71,7 +71,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecparallel_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_nvecparallel_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPARALLEL header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fnvecparallel_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF()
+diff -Naur cvode-3.2.1-orig/src/nvec_parhyp/CMakeLists.txt cvode-3.2.1/src/nvec_parhyp/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_parhyp/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_parhyp/CMakeLists.txt	2018-11-03 09:10:26.230608100 +0300
+@@ -76,7 +76,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_nvecparhyp_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPARHYP header files
+diff -Naur cvode-3.2.1-orig/src/nvec_petsc/CMakeLists.txt cvode-3.2.1/src/nvec_petsc/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_petsc/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_petsc/CMakeLists.txt	2018-11-03 09:10:50.680006500 +0300
+@@ -75,7 +75,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_nvecpetsc_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPARHYP header files
+diff -Naur cvode-3.2.1-orig/src/nvec_pthreads/CMakeLists.txt cvode-3.2.1/src/nvec_pthreads/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_pthreads/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_pthreads/CMakeLists.txt	2018-11-03 09:11:18.792614500 +0300
+@@ -64,7 +64,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_nvecpthreads_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPTHREADS header files
+@@ -91,7 +91,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared 
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fnvecpthreads_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+ 
+diff -Naur cvode-3.2.1-orig/src/nvec_raja/CMakeLists.txt cvode-3.2.1/src/nvec_raja/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_raja/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_raja/CMakeLists.txt	2018-11-03 09:11:55.121692400 +0300
+@@ -91,7 +91,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nveccudaraja CLEAN_DIRECT_OUTPUT 1
+                VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION}
+   )
+-  INSTALL(TARGETS sundials_nveccudaraja_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nveccudaraja_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+   # ----------------------- MPI+CUDA
+   IF(MPI_ENABLE)
+@@ -100,7 +100,7 @@
+       PROPERTIES OUTPUT_NAME sundials_nvecmpicudaraja CLEAN_DIRECT_OUTPUT 1
+                  VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION}
+     )
+-    INSTALL(TARGETS sundials_nvecmpicudaraja_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_nvecmpicudaraja_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF()
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+diff -Naur cvode-3.2.1-orig/src/nvec_ser/CMakeLists.txt cvode-3.2.1/src/nvec_ser/CMakeLists.txt
+--- cvode-3.2.1-orig/src/nvec_ser/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/nvec_ser/CMakeLists.txt	2018-11-03 09:12:24.357364600 +0300
+@@ -62,7 +62,7 @@
+     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecserial_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_nvecserial_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECSERIAL header files
+@@ -89,7 +89,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fnvecserial_shared 
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fnvecserial_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_band/CMakeLists.txt cvode-3.2.1/src/sunlinsol_band/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_band/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_band/CMakeLists.txt	2018-11-03 09:13:30.009119600 +0300
+@@ -66,7 +66,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolband CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolband_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolband_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolband_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLBAND header files
+@@ -96,7 +96,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolband CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolband_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolband_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolband_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_dense/CMakeLists.txt cvode-3.2.1/src/sunlinsol_dense/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_dense/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_dense/CMakeLists.txt	2018-11-03 09:13:57.133671100 +0300
+@@ -65,7 +65,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsoldense CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsoldense_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsoldense_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsoldense_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLDENSE header files
+@@ -95,7 +95,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsoldense CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsoldense_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsoldense_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsoldense_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_klu/CMakeLists.txt cvode-3.2.1/src/sunlinsol_klu/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_klu/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_klu/CMakeLists.txt	2018-11-03 09:14:26.211334200 +0300
+@@ -67,7 +67,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolklu CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolklu_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolklu_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolklu_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLKLU header files
+@@ -96,7 +96,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolklu CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolklu_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolklu_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolklu_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_lapackband/CMakeLists.txt cvode-3.2.1/src/sunlinsol_lapackband/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_lapackband/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_lapackband/CMakeLists.txt	2018-11-03 09:14:56.279054000 +0300
+@@ -68,7 +68,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsollapackband CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsollapackband_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsollapackband_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsollapackband_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLLAPACKBAND header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsollapackband CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsollapackband_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsollapackband_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsollapackband_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_lapackdense/CMakeLists.txt cvode-3.2.1/src/sunlinsol_lapackdense/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_lapackdense/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_lapackdense/CMakeLists.txt	2018-11-03 09:15:26.268769300 +0300
+@@ -74,7 +74,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsollapackdense CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsollapackdense_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsollapackdense_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsollapackdense_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLLAPACKDENSE header files
+@@ -104,7 +104,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsollapackdense CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsollapackdense_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsollapackdense_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsollapackdense_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_pcg/CMakeLists.txt cvode-3.2.1/src/sunlinsol_pcg/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_pcg/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_pcg/CMakeLists.txt	2018-11-03 09:15:54.269370800 +0300
+@@ -69,7 +69,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolpcg CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolpcg_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolpcg_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolpcg_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLPCG header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolpcg CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolpcg_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolpcg_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolpcg_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_spbcgs/CMakeLists.txt cvode-3.2.1/src/sunlinsol_spbcgs/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_spbcgs/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_spbcgs/CMakeLists.txt	2018-11-03 09:16:25.552160100 +0300
+@@ -69,7 +69,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolspbcgs CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolspbcgs_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolspbcgs_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolspbcgs_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLSPBCGS header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolspbcgs CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolspbcgs_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolspbcgs_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolspbcgs_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_spfgmr/CMakeLists.txt cvode-3.2.1/src/sunlinsol_spfgmr/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_spfgmr/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_spfgmr/CMakeLists.txt	2018-11-03 09:16:50.576591400 +0300
+@@ -69,7 +69,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolspfgmr CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolspfgmr_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolspfgmr_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolspfgmr_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLSPFGMR header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolspfgmr CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolspfgmr_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolspfgmr_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolspfgmr_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_spgmr/CMakeLists.txt cvode-3.2.1/src/sunlinsol_spgmr/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_spgmr/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_spgmr/CMakeLists.txt	2018-11-03 09:17:16.279061500 +0300
+@@ -69,7 +69,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolspgmr CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolspgmr_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolspgmr_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolspgmr_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLSPGMR header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolspgmr CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolspgmr_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolspgmr_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolspgmr_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_sptfqmr/CMakeLists.txt cvode-3.2.1/src/sunlinsol_sptfqmr/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_sptfqmr/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_sptfqmr/CMakeLists.txt	2018-11-03 09:17:44.225660000 +0300
+@@ -69,7 +69,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolsptfqmr CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolsptfqmr_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolsptfqmr_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolsptfqmr_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLSPTFQMR header files
+@@ -98,7 +98,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolsptfqmr CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolsptfqmr_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolsptfqmr_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolsptfqmr_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+ 
+diff -Naur cvode-3.2.1-orig/src/sunlinsol_superlumt/CMakeLists.txt cvode-3.2.1/src/sunlinsol_superlumt/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunlinsol_superlumt/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunlinsol_superlumt/CMakeLists.txt	2018-11-03 09:18:13.560337800 +0300
+@@ -78,7 +78,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunlinsolsuperlumt CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunlinsolsuperlumt_shared
+     PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunlinsolsuperlumt_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunlinsolsuperlumt_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNLINSOLSUPERLUMT header files
+@@ -107,7 +107,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunlinsolsuperlumt CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunlinsolsuperlumt_shared 
+       PROPERTIES VERSION ${sunlinsollib_VERSION} SOVERSION ${sunlinsollib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunlinsolsuperlumt_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunlinsolsuperlumt_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunmat_band/CMakeLists.txt cvode-3.2.1/src/sunmat_band/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunmat_band/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunmat_band/CMakeLists.txt	2018-11-03 09:18:43.280037700 +0300
+@@ -68,7 +68,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunmatrixband CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunmatrixband_shared
+     PROPERTIES VERSION ${sunmatrixlib_VERSION} SOVERSION ${sunmatrixlib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunmatrixband_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunmatrixband_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNMATRIXBAND header files
+@@ -95,7 +95,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunmatrixband CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunmatrixband_shared 
+       PROPERTIES VERSION ${sunmatrixlib_VERSION} SOVERSION ${sunmatrixlib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunmatrixband_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunmatrixband_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunmat_dense/CMakeLists.txt cvode-3.2.1/src/sunmat_dense/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunmat_dense/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunmat_dense/CMakeLists.txt	2018-11-03 09:19:12.024681800 +0300
+@@ -68,7 +68,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunmatrixdense CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunmatrixdense_shared
+     PROPERTIES VERSION ${sunmatrixlib_VERSION} SOVERSION ${sunmatrixlib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunmatrixdense_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunmatrixdense_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNMATRIXDENSE header files
+@@ -95,7 +95,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunmatrixdense CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunmatrixdense_shared 
+       PROPERTIES VERSION ${sunmatrixlib_VERSION} SOVERSION ${sunmatrixlib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunmatrixdense_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunmatrixdense_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff -Naur cvode-3.2.1-orig/src/sunmat_sparse/CMakeLists.txt cvode-3.2.1/src/sunmat_sparse/CMakeLists.txt
+--- cvode-3.2.1-orig/src/sunmat_sparse/CMakeLists.txt	2018-10-11 22:22:10.000000000 +0300
++++ cvode-3.2.1/src/sunmat_sparse/CMakeLists.txt	2018-11-03 09:19:40.087286900 +0300
+@@ -68,7 +68,7 @@
+     PROPERTIES OUTPUT_NAME sundials_sunmatrixsparse CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_sunmatrixsparse_shared
+     PROPERTIES VERSION ${sunmatrixlib_VERSION} SOVERSION ${sunmatrixlib_SOVERSION})
+-  INSTALL(TARGETS sundials_sunmatrixsparse_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++  INSTALL(TARGETS sundials_sunmatrixsparse_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the SUNMATRIXSPARSE header files
+@@ -95,7 +95,7 @@
+       PROPERTIES OUTPUT_NAME sundials_fsunmatrixsparse CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fsunmatrixsparse_shared 
+       PROPERTIES VERSION ${sunmatrixlib_VERSION} SOVERSION ${sunmatrixlib_SOVERSION})
+-    INSTALL(TARGETS sundials_fsunmatrixsparse_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
++    INSTALL(TARGETS sundials_fsunmatrixsparse_shared RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ 
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
diff --git a/mingw-w64-cvode/PKGBUILD b/mingw-w64-cvode/PKGBUILD
index 293a3436c4..4ff1e953de 100644
--- a/mingw-w64-cvode/PKGBUILD
+++ b/mingw-w64-cvode/PKGBUILD
@@ -10,8 +10,15 @@ arch=('any')
 url="https://computation.llnl.gov/projects/sundials"
 license=('BSD')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
-source=("${_realname}-${pkgver}.tar.gz"::https://computation.llnl.gov/projects/sundials/download/${_realname}-${pkgver}.tar.gz)
-sha256sums=('aa4f5f3c5114e93ba246630cf107b1f73de5c1028a013602c114d3cde6564451')
+source=("${_realname}-${pkgver}.tar.gz"::https://computation.llnl.gov/projects/sundials/download/${_realname}-${pkgver}.tar.gz
+        001-install-location.patch)
+sha256sums=('aa4f5f3c5114e93ba246630cf107b1f73de5c1028a013602c114d3cde6564451'
+            'aea097dc7c040161c67d0588147ff2aa4f2ae170c32d3cf8b246c28b71c39109')
+
+prepare() {
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/001-install-location.patch
+}
 
 build() {
   [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
@@ -32,13 +39,8 @@ package() {
   cd build-${MINGW_CHOST}
   make DESTDIR=${pkgdir} install
 
-  # The DLLs must be in the bin runtime directory to be found
-  mkdir -p ${pkgdir}${MINGW_PREFIX}/bin
-  mv ${pkgdir}${MINGW_PREFIX}/lib/*.dll ${pkgdir}${MINGW_PREFIX}/bin/
-
   # license
   rm ${pkgdir}${MINGW_PREFIX}/include/sundials/LICENSE
   install -D -m644 ${srcdir}/${_realname}-${pkgver}/LICENSE \
   ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 }
-