From 0bcdf7f4754f8d4e4c0c42cc7b9d30aa1cf24425 Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Tue, 31 Dec 2024 13:36:24 -0800 Subject: [PATCH] Build updates. --- .github/workflows/main.yml | 6 +++--- CMakeLists.txt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 76bfc120..febc3e7c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,13 +15,13 @@ jobs: fail-fast: false matrix: platform: - - name: macos-12-release + - name: macos-13-release os_type: macos os_name: macos-12 build_type: Release build_python: ON build_qt_antimony: ON - - name: macos-12-debug + - name: macos-13-debug os_type: macos os_name: macos-12 build_type: Debug @@ -82,7 +82,7 @@ jobs: libroadrunner_deps_owner: [ "sys-bio" ] libroadrunner_deps_repo: [ "libroadrunner-deps" ] libroadrunner_deps_name: [ "libroadrunner-deps" ] - libroadrunner_deps_release_version: [ "v2.2.12" ] + libroadrunner_deps_release_version: [ "v2.2.13" ] python_version: [ "3.12" ] runs-on: ${{ matrix.platform.os_name }} diff --git a/CMakeLists.txt b/CMakeLists.txt index cb388346..d7675fda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,7 +267,7 @@ endif() if(WITH_LIBSBML_LIBXML) find_library(LIBXML_LIBRARY NAMES libxml2.lib libxml2.so libxml2.dylib libxml2 libxml2s libxml2sd - PATHS /usr/lib /usr/local/lib + PATHS /usr/lib /usr/local/lib ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dependencies/lib ${LIBSBML_INCLUDE_DIR}/../lib @@ -276,8 +276,8 @@ if(WITH_LIBSBML_LIBXML) #The libxml library requires the libz library, too. find_library(ZDLL_LIBRARY - NAMES zdll.lib zdll.so zdll.dylib zdll z zlibd.lib zlibstaticd.lib zlibmd.lib zlibstatic.lib - PATHS /usr/lib /usr/local/lib + NAMES zlibstatic.lib zlibstaticd.lib zlibstaticmd.lib zlibstatic zlibstaticd zlibstaticmd + PATHS /usr/lib /usr/local/lib ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dependencies/lib ${LIBSBML_INCLUDE_DIR}/../lib @@ -318,7 +318,7 @@ endif() if(WITH_LIBSBML_COMPRESSION) find_library(ZDLL_LIBRARY - NAMES zdll.lib zdll.so zdll.dylib zdll z zlibd.lib zlibstaticd.lib zlibmd.lib zlibstatic.lib + NAMES zlibstatic.lib zlibstaticd.lib zlibstaticmd.lib zlibstatic zlibstaticd zlibstaticmd PATHS /usr/lib /usr/local/lib ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/dependencies/lib