Latest release

.github/workflows/main.yml

@@ -14,15 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        cpp_standard: [26]
         platform:
-          - name: macos-12-release
-            os_type: macos
-            os_name: macos-12
-            build_type: Release
-          - name: macos-12-debug
-            os_type: macos
-            os_name: macos-12
-            build_type: Debug
           - name: macos-14-release
             os_type: macos
             os_name: macos-14
@@ -31,6 +24,14 @@ jobs:
             os_type: macos
             os_name: macos-14
             build_type: Debug
+          - name: macos-15-intel-release
+            os_type: macos
+            os_name: macos-15-intel
+            build_type: Release
+          - name: macos-15-intel-debug
+            os_type: macos
+            os_name: macos-15-intel
+            build_type: Debug
           - name: ubuntu-latest-release
             os_type: ubuntu
             os_name: ubuntu-latest
@@ -69,7 +70,7 @@ jobs:
 
       - name: Set MSVC as the default compiler on Windows
         if: matrix.platform.os_type == 'windows'
-        uses: ilammy/msvc-dev-cmd@v1.6.0
+        uses: ilammy/msvc-dev-cmd@v1.13.0
 
       - name: Upgrade gcc on Linux
         if: matrix.platform.os_type == 'manylinux'
@@ -130,7 +131,7 @@ jobs:
         shell: cmake -P {0}
         run: |
           string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-          message("::set-output name=timestamp::${current_date}")
+          message("timestamp=${current_date}" >> $GITHUB_OUTPUT)
 
       - name: Set ccache cache directory on non-Windows
         if: matrix.platform.os_type != 'windows'
@@ -166,6 +167,7 @@ jobs:
           -DCMAKE_CXX_COMPILER_LAUNCHER=${COMPILER_LAUNCHER} \
           -DCMAKE_BUILD_TYPE=${{ matrix.platform.build_type }} \
           -DCMAKE_OSX_ARCHITECTURES=${OSX_ARCHITECTURES} \
+          -DCMAKE_CXX_STANDARD=${{matrix.cpp_standard}} \
           -DCMAKE_INSTALL_PREFIX="${RUNNER_WORKSPACE}/install-libroadrunner-deps"
 
       - name: Build and install LibRoadRunner Dependencies
@@ -193,10 +195,10 @@ jobs:
             os_name_without_build_type="${os_name%%-*}"
             echo "artifacts_name=libroadrunner-deps-${os_name_without_build_type}-${host_architecture}-${{ matrix.platform.build_type }}" >> "${GITHUB_ENV}"
           fi
-          echo "artifacts_path=../install-libroadrunner-deps" >> "${GITHUB_ENV}"
+          echo "artifacts_path=${RUNNER_WORKSPACE}/install-libroadrunner-deps" >> "${GITHUB_ENV}"
 
       - name: Upload LibRoadRunner Dependencies binaries
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{env.artifacts_name}}
           path: ${{env.artifacts_path}}

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/sys-bio/bzip2.git
 [submodule "third_party/zlib"]
 	path = third_party/zlib
-	url = https://github.com/sys-bio/zlib.git
+	url = https://github.com/madler/zlib.git
 [submodule "third_party/nleq2"]
 	path = third_party/nleq2
 	url = https://github.com/sys-bio/nleq2.git
@@ -37,4 +37,4 @@
 	branch = use-as-submodule
 [submodule "third_party/SBMLNetwork"]
 	path = third_party/SBMLNetwork
-	url = https://github.com/adelhpour/SBMLNetwork.git
+	url = https://github.com/sys-bio/SBMLNetwork.git

third_party/CMakeLists.txt

@@ -1,14 +1,19 @@
 # zlib
 message(STATUS "Adding zlib as subdirectory")
+set(ZLIB_BUILD_SHARED OFF CACHE BOOL "Don't build shared zlib libraries")
+# SET(SOME_EXPAT_OPTION OFF CACHE BOOL "Use some expat option")
 add_subdirectory(zlib)
-set(ZLIB_INCLUDE_DIR "$<TARGET_PROPERTY:zlib,INCLUDE_DIRECTORIES>")
-set(LIBZ_INCLUDE_DIR "$<TARGET_PROPERTY:zlib,INCLUDE_DIRECTORIES>")
+message(STATUS "The final value of zlib_build_shared: ${ZLIB_BUILD_SHARED}")
+set(ZLIB_INCLUDE_DIR "$<TARGET_PROPERTY:zlibstatic,INCLUDE_DIRECTORIES>")
+set(LIBZ_INCLUDE_DIR "$<TARGET_PROPERTY:zlibstatic,INCLUDE_DIRECTORIES>")
 #For the auto-generated zconf.h:
 #set(EXTRA_INCLUDE_DIRS "${EXTRA_INCLUDE_DIRS}" "${CMAKE_CURRENT_BINARY_DIR}/zlib/")
-set(EXTRA_INCLUDE_DIRS "${EXTRA_INCLUDE_DIRS}" "$<TARGET_PROPERTY:zlib,INCLUDE_DIRECTORIES>")
+set(EXTRA_INCLUDE_DIRS "${EXTRA_INCLUDE_DIRS}" "$<TARGET_PROPERTY:zlibstatic,INCLUDE_DIRECTORIES>")
 #message(STATUS "LIBZ_INCLUDE_DIR: ${LIBZ_INCLUDE_DIR}")
 message(STATUS "Extra include directories: ${EXTRA_INCLUDE_DIRS}")
 set(LIBZ_LIBRARY zlibstatic)
+#add_library(ZLIB:ZLIB ALIAS zlibstatic)
+set(ZLIB_LIBRARY "$<TARGET_LINKER_FILE:zlibstatic>" CACHE FILEPATH "zlib static library" FORCE)
 
 # nleq1
 message(STATUS "Adding nleq1 as subdirectory")
@@ -40,6 +45,8 @@ add_dependencies(lapack zlibstatic)
 #set(CHECK_INCLUDE_DIR "$<TARGET_PROPERTY:check,INCLUDE_DIRECTORIES>")
 
 ## poco
+set(ENABLE_UTIL OFF "Turn off util functions" FORCE)
+
 message(STATUS "Adding poco as subdirectory")
 add_subdirectory(poco)
 
@@ -71,20 +78,17 @@ if (WIN32)
     set(LIBSBML_TARGET_ID "libsbml-static")
     set(LIBSBML_INCLUDE_DIR "$<TARGET_PROPERTY:libsbml-static,INCLUDE_DIRECTORIES>")
     set(LIBSBML_INCLUDE_DIRS "$<TARGET_PROPERTY:libsbml-static,INCLUDE_DIRECTORIES>")
-    set(LIBSBML_LIBRARY "$<TARGET_LINKER_FILE:libsbml-static>" CACHE FILEPATH "libsbml library" FORCE)
+    set(LIBSBML_LIBRARY "$<TARGET_LINKER_FILE:libsbml-static>" CACHE FILEPATH "libsbml static library" FORCE)
 else (WIN32)
     set(LIBSBML_TARGET_ID "sbml-static")
     set(LIBSBML_INCLUDE_DIR "$<TARGET_PROPERTY:sbml-static,INCLUDE_DIRECTORIES>")
     set(LIBSBML_INCLUDE_DIRS "$<TARGET_PROPERTY:sbml-static,INCLUDE_DIRECTORIES>")
-    set(LIBSBML_LIBRARY "$<TARGET_LINKER_FILE:sbml-static>" CACHE FILEPATH "libsbml library" FORCE)
+    set(LIBSBML_LIBRARY "$<TARGET_LINKER_FILE:sbml-static>" CACHE FILEPATH "libsbml static library" FORCE)
 endif (WIN32)
 
 add_dependencies("${LIBSBML_TARGET_ID}" expat zlibstatic)
 set(FIND_LIBSBML OFF CACHE BOOL "Find libsbml." FORCE)
 
-# Revert LIBZ_INCLUDE_DIR because it'll make things fail otherwise.
-set(LIBZ_INCLUDE_DIR "$<TARGET_PROPERTY:zlib,INCLUDE_DIRECTORIES>")
-
 ## rr-libstruct
 message(STATUS "Adding rr-libstruct as subdirectory")
 add_subdirectory(rr-libstruct)