File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed
Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,9 @@ if(NOT WIN32 AND NOT APPLE)
1515endif ()
1616
1717# libpng relies on zlib, which we need the system version for on Mac.
18- find_package (ZLIB REQUIRED)
18+ if (APPLE OR CPU_ARCH_ARM32 OR CPU_ARCH_ARM64)
19+ find_package (ZLIB REQUIRED)
20+ endif ()
1921
2022# Enforce use of bundled dependencies to avoid conflicts with system libraries.
2123set (FIND_ROOT_PATH_BACKUP ${CMAKE_FIND_ROOT_PATH} )
@@ -29,12 +31,17 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
2931set (CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
3032set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
3133
34+ # Search for local zlib version outside of Mac.
35+ if (NOT APPLE AND NOT CPU_ARCH_ARM32 AND NOT CPU_ARCH_ARM64)
36+ find_package (ZLIB 1.3.1 REQUIRED)
37+ endif ()
38+
3239# Bundled dependencies.
33- find_package (SDL3 3.2.26 REQUIRED)
3440find_package (zstd 1.5.7 REQUIRED)
3541find_package (WebP REQUIRED) # v1.4.0, spews an error on Linux because no pkg-config.
3642find_package (PNG 1.6.50 REQUIRED)
3743find_package (JPEG REQUIRED)
44+ find_package (SDL3 3.2.26 REQUIRED)
3845find_package (Freetype 2.13.3 REQUIRED)
3946find_package (harfbuzz REQUIRED)
4047find_package (plutosvg 0.0.6 REQUIRED)
You can’t perform that action at this time.
0 commit comments