Merge 09335dc into 98682ce

opencor · Dec 17, 2018 · 9c9786c · 9c9786c
2 parents 98682ce + 09335dc
commit 9c9786c
Show file tree

Hide file tree

Showing 2 changed files with 167 additions and 110 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,7 @@ option(USE_PREBUILT_QSCINTILLA_PACKAGE "Use the pre-built version of the QScinti
 option(USE_PREBUILT_QWT_PACKAGE "Use the pre-built version of the Qwt package" ON)
 option(USE_PREBUILT_SUNDIALS_PACKAGE "Use the pre-built version of the SUNDIALS package" ON)
 option(USE_PREBUILT_ZLIB_PACKAGE "Use the pre-built version of the zlib package" ON)
+set(USE_PREBUILT_SUNDIALS_PACKAGE OFF)
 
 if(ENABLE_TEST_PLUGINS)
     option(USE_PREBUILT_ZINC_PACKAGE "Use the pre-built version of the Zinc package" ON)
@@ -933,6 +934,9 @@ if(ENABLE_TEST_PLUGINS)
         widget/ZincWidget
     )
 endif()
+set(PLUGINS
+    thirdParty/SUNDIALS
+)
 
 if(NOT USE_PREBUILT_QTWEBKIT_PACKAGE)
     # We want to build our copy of the QtWebKit package, so don't build any