Skip to content

Build on macos-15. #52

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 6 commits into from
Oct 31, 2025
Merged

Build on macos-15. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0a598c
Build on macos-15.
luciansmith Oct 7, 2025
1e3d858
Update poco.
luciansmith Oct 7, 2025
88c769b
Finish expunging ZLIB from everything in favor of ZLIBSTATIC
luciansmith Oct 10, 2025
93ed8e2
Update SBMLNetwork.
luciansmith Oct 16, 2025
ca286d3
Update SBMLNetwork.
luciansmith Oct 17, 2025
907c206
Use macos15-intel for mac intel machines.
luciansmith Oct 30, 2025
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
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ jobs:
matrix:
cpp_standard: [26]
platform:
- name: macos-13-release
os_type: macos
os_name: macos-13
build_type: Release
- name: macos-13-debug
os_type: macos
os_name: macos-13
build_type: Debug
- name: macos-14-release
os_type: macos
os_name: macos-14
Expand All @@ -32,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
Expand Down
11 changes: 8 additions & 3 deletions third_party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# 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)
Expand Down Expand Up @@ -42,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)

Expand Down
2 changes: 1 addition & 1 deletion third_party/SBMLNetwork
Open in desktop
Submodule SBMLNetwork updated 3 files
+0 −10 src/libsbmlnetwork_sbmldocument.cpp
+0 −6 src/libsbmlnetwork_sbmldocument.h
+6 −0 src/libsbmlnetwork_sbmldocument_render.cpp
2 changes: 1 addition & 1 deletion third_party/libSEDML
Open in desktop
Submodule libSEDML updated 1 files
+1 −1 CMakeLists.txt
2 changes: 1 addition & 1 deletion third_party/poco
Open in desktop
Submodule poco updated 4626 files