Maintenance.

agarny · May 27, 2024 · 871c4f7 · 871c4f7
2 parents ccc2305 + 331d4a0
commit 871c4f7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/src/3rdparty/libSBML/CMakeLists.txt b/src/3rdparty/libSBML/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(PACKAGE_NAME libSBML)
-set(PACKAGE_VERSION 5.19.6)
+set(PACKAGE_VERSION 5.20.2)
 set(PACKAGE_REPOSITORY libsbml)
-set(RELEASE_TAG v5.19.6-libopencor)
+set(RELEASE_TAG v5.20.2b)
 set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
 
 # Either retrieve or build our package.
@@ -28,32 +28,32 @@ if(LIBOPENCOR_PREBUILT_LIBSBML)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         da5d9db8b53f0afebfc75fb4a6dbaa7fae17540e)
+                         11fe48981258511e093ea1ea16c3ba370a2da33b)
     else()
         if(WIN32)
             if(RELEASE_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 9908f803eaa644aa262df64c17243e38d1f5f8f4)
+                                 07e00c0cce28b617d98ed1d06178dff292aac771)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 b8a48f56f18e495062ba20f087ab5097e0d4b2ce)
+                                 6f39b6611fd822055e15c8af9a1942bb9628859a)
             endif()
         elseif(APPLE)
             if(INTEL_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 f9d89084dd9bcb724e68beddcba924c6fb21147e)
+                                 5dee5db5dfe960ec0a8d1b098c8939b020a13609)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 694ad628772f8fd5009d6f048a4062079cafa5c8)
+                                 08039fecb28dbd0f644cdd38bc5c857718f7db1d)
             endif()
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             b968f19fc3f91f6b639ba7df671025d0838780c8)
+                             80d834206af0c3dbcd45d5e228288d16171ebc94)
         endif()
     endif()
 else()

diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(PACKAGE_NAME zlib)
-set(PACKAGE_VERSION 2.1.1-beta2)
+set(PACKAGE_VERSION 2.1.6)
 set(PACKAGE_REPOSITORY zlib-ng)
-set(RELEASE_TAG 2.1.1-beta2)
+set(RELEASE_TAG 2.1.6)
 set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
 
 # Either retrieve or build our package.
@@ -24,32 +24,32 @@ if(LIBOPENCOR_PREBUILT_ZLIB)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         544da662b566972b50f815197c89039fbb8088ff)
+                         be6986ea91a9e61474321bc8eecfd4a18b2c48c5)
     else()
         if(WIN32)
             if(RELEASE_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 7c015f7895f7fbe64ba5b16706bcc43b01bcd0d7)
+                                 c0452a635bd0206648219341ffb90b76441b8472)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 02dc0bb878774be91b4a2a3130ec9a50eb177537)
+                                 3fac0e6cec7df429e0f41a79786f9bc699a4921e)
             endif()
         elseif(APPLE)
             if(INTEL_MODE)
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 36c02336dba035a149b6aa45106bc48dc0a86410)
+                                 cb8f7e83a9eab059b96360306e6459063509b5b2)
             else()
                 retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                                  ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                                 5d5e78176c1c30bab29f51f5688d2848add1a4e2)
+                                 14656bd60de8b946ff42ad5cca4f42f82a74da0e)
             endif()
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             01c902f7f7870de1ae1bc25c57e572f8969380ab)
+                             6d4be8632edaaa840cf0e36d1b0e382afb2b2c57)
         endif()
     endif()
 else()

diff --git a/src/solver/solvercvode.cpp b/src/solver/solvercvode.cpp
@@ -220,9 +220,10 @@ bool SolverCvode::Impl::initialise(double pVoi, size_t pSize, double *pStates, d
 
     ASSERT_NE(mSolver, nullptr);
 
-    // Use our own error handler.
+    // Use our own error handler and disable the logger.
 
     ASSERT_EQ(SUNContext_PushErrHandler(mSunContext, errorHandler, &mErrorMessage), CV_SUCCESS);
+    ASSERT_EQ(SUNContext_SetLogger(mSunContext, nullptr), CV_SUCCESS);
 
     // Initialise our CVODE solver.
 

diff --git a/src/solver/solverkinsol.cpp b/src/solver/solverkinsol.cpp
@@ -150,10 +150,11 @@ bool SolverKinsol::Impl::solve(ComputeSystem pComputeSystem, double *pU, size_t
 
     ASSERT_NE(solver, nullptr);
 
-    // Use our own error handler.
+    // Use our own error handler and disable the logger.
 
 #ifndef CODE_COVERAGE_ENABLED
     ASSERT_EQ(SUNContext_PushErrHandler(context, errorHandler, &mErrorMessage), KIN_SUCCESS);
+    ASSERT_EQ(SUNContext_SetLogger(context, nullptr), KIN_SUCCESS);
 #endif
 
     // Initialise our KINSOL solver.

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -120,7 +120,7 @@ if(LIBOPENCOR_UNIT_TESTING)
     endforeach()
 
     add_target(unit_testing
-               COMMAND ${CMAKE_CTEST_COMMAND} --force-new-ctest-process
+               COMMAND ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
                DEPENDS ${TEST_TARGETS}
                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
                USES_TERMINAL