Skip to content

fix(deps): use system zlib for Assimp on macOS/Linux #11051

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

Open
BenJule wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

fix(deps): use system zlib for Assimp on macOS/Linux #11051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion deps/Assimp/Assimp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@ else()
set(_assimp_hash "SHA256=66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb")
endif()

# Assimp bundles an old zlib (contrib/zlib) whose K&R-style function declarations
# (e.g. `int ZEXPORT compress2(dest, destLen, ...)`) and fdopen() macro no longer
# parse against the macOS 15+ / 26 SDK, breaking the dependency build on Mac.
# The system zlib is always available on macOS and Linux, so link against it there
# and only keep Assimp's bundled copy on Windows.
if (WIN32)
set(_assimp_build_zlib ON)
else ()
set(_assimp_build_zlib OFF)
endif ()

bambustudio_add_cmake_project(Assimp
URL ${_assimp_url}
URL_HASH ${_assimp_hash}
Expand All @@ -19,7 +30,7 @@ bambustudio_add_cmake_project(Assimp
-DASSIMP_BUILD_GLTF_IMPORTER=ON
-DASSIMP_BUILD_OBJ_IMPORTER=ON
-DASSIMP_BUILD_FBX_IMPORTER=ON
-DASSIMP_BUILD_ZLIB=ON
-DASSIMP_BUILD_ZLIB=${_assimp_build_zlib}
-DASSIMP_WARNINGS_AS_ERRORS=OFF
-DBUILD_WITH_STATIC_CRT=OFF
)
Expand Down
Loading