Skip to content

Make ZLib optional. #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luciansmith merged 5 commits into from
Aug 29, 2026
Merged

Make ZLib optional. #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9908278
Make ZLib optional.
luciansmith Aug 28, 2026
25d8cca
Update dependencies.
luciansmith Aug 28, 2026
9c04874
More fixes to build in emscripten, and hopefully work on manylinux.
luciansmith Aug 28, 2026
3b53ee2
Use GITHUB_PATH for manylinux build/tests.
luciansmith Aug 28, 2026
a7b2f54
Add python to the LD_LIBRARY_PATH.
luciansmith Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ jobs:
libroadrunner_deps_owner: [ "sys-bio" ]
libroadrunner_deps_repo: [ "libroadrunner-deps" ]
libroadrunner_deps_name: [ "libroadrunner-deps" ]
libroadrunner_deps_release_version: [ "v2.2.22" ]
python_version: [ "3.11" ]
libroadrunner_deps_release_version: [ "v2.3.5" ]
python_version: [ "3.14" ]
runs-on: ${{ matrix.platform.os_name }}
container:
image: ${{ matrix.platform.container_image || '' }}
Expand Down Expand Up @@ -179,8 +179,9 @@ jobs:
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
bash Miniconda3-latest-Linux-x86_64.sh -b -p /Miniconda3
/Miniconda3/bin/conda create -y --name python${{ matrix.python_version }} python=${{ matrix.python_version }}
/Miniconda3/bin/conda init && bash ~/.bashrc && . ~/.bashrc cd ${RUNNER_WORKSPACE}
echo "export PATH=/Miniconda3/envs/python${{ matrix.python_version }}/bin:$PATH" >> "${GITHUB_ENV}"
cd ${RUNNER_WORKSPACE}
echo "/Miniconda3/envs/python${{ matrix.python_version }}/bin" >> "${GITHUB_PATH}"
echo "LD_LIBRARY_PATH=/Miniconda3/envs/python${{ matrix.python_version }}/lib:$LD_LIBRARY_PATH" >> "${GITHUB_ENV}"

- name: Download Dependencies binaries
shell: bash
Expand Down
47 changes: 30 additions & 17 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,42 @@ else ()
endif ()

## Find ZLIB
find_package(ZLIB CONFIG REQUIRED)
set(LIBZ_LIBRARY ZLIB::ZLIBSTATIC)
get_target_property(LIBZ_LIBRARY_LOCATION ZLIB::ZLIBSTATIC LOCATION)
message(STATUS "ZLIB Library: ${LIBZ_LIBRARY_LOCATION}")
set(ZLIB_LIBRARY "${LIBZ_LIBRARY_LOCATION}" CACHE FILEPATH "Path to zlib library" FORCE)
set(ZLIB_INCLUDE_DIR "${DEPENDENCIES_INSTALL_PREFIX}/include" CACHE PATH "Path to zlib include directory" FORCE)
set(ZLIB_FOUND TRUE CACHE BOOL "ZLIB found" FORCE)
option(WITH_ZLIB "Link libsbmlnetwork against zlib." ON)
set(LIBZ_LIBRARY "")
if (WITH_ZLIB)
find_package(ZLIB CONFIG REQUIRED)
set(LIBZ_LIBRARY ZLIB::ZLIBSTATIC)
get_target_property(LIBZ_LIBRARY_LOCATION ZLIB::ZLIBSTATIC LOCATION)
message(STATUS "ZLIB Library: ${LIBZ_LIBRARY_LOCATION}")
set(ZLIB_LIBRARY "${LIBZ_LIBRARY_LOCATION}" CACHE FILEPATH "Path to zlib library" FORCE)
set(ZLIB_INCLUDE_DIR "${DEPENDENCIES_INSTALL_PREFIX}/include" CACHE PATH "Path to zlib include directory" FORCE)
set(ZLIB_FOUND TRUE CACHE BOOL "ZLIB found" FORCE)
endif ()

## Find expat
find_package(expat CONFIG REQUIRED)
set(EXPAT_LIBRARY expat::expat)
get_target_property(EXPAT_LIBRARY_LOCATION expat::expat LOCATION)
get_target_property(EXPAT_INCLUDE_DIR expat::expat INTERFACE_INCLUDE_DIRECTORIES)
message(STATUS "Expat Library: ${EXPAT_LIBRARY_LOCATION}")
message(STATUS "Expat Include: ${EXPAT_INCLUDE_DIR}")
if (DEFINED EXPAT_LIBRARY AND DEFINED EXPAT_INCLUDE_DIR)
message(STATUS "Expat Library: ${EXPAT_LIBRARY}")
message(STATUS "Expat Include: ${EXPAT_INCLUDE_DIR}")
else ()
find_package(expat CONFIG REQUIRED)
set(EXPAT_LIBRARY expat::expat)
get_target_property(EXPAT_LIBRARY_LOCATION expat::expat LOCATION)
get_target_property(EXPAT_INCLUDE_DIR expat::expat INTERFACE_INCLUDE_DIRECTORIES)
message(STATUS "Expat Library: ${EXPAT_LIBRARY_LOCATION}")
message(STATUS "Expat Include: ${EXPAT_INCLUDE_DIR}")
endif ()

## Find libSBML
find_package(${SBML_TARGET_NAME} CONFIG REQUIRED)
set(LIBSBML_LIBRARY ${SBML_TARGET_NAME})
message(STATUS "libSBML Target: ${LIBSBML_LIBRARY}")
if (DEFINED LIBSBML_LIBRARY)
message(STATUS "libSBML Library: ${LIBSBML_LIBRARY}")
else ()
find_package(${SBML_TARGET_NAME} CONFIG REQUIRED)
set(LIBSBML_LIBRARY ${SBML_TARGET_NAME})
message(STATUS "libSBML Target: ${LIBSBML_LIBRARY}")
endif ()

## Set dependencies include directory
set(DEPENDENCIES_INCLUDE_DIR "${DEPENDENCIES_INSTALL_PREFIX}/include")
set(DEPENDENCIES_INCLUDE_DIR "${DEPENDENCIES_INSTALL_PREFIX}/include" "${LIBSBML_INSTALL_PREFIX}/include" "${EXPAT_INCLUDE_DIR}")

## whether to build the dynamic version of the library
set(BUILD_SHARED_LIBS ON CACHE BOOL "Build the dynamic version of the library")
Expand Down
Loading