fix(deps): let minizip-ng find locally-built zlibs

zachlewis · zachlewis · commit 34ed8b0cb096 · 2025-03-07T21:50:16.000-05:00
Signed-off-by: Zach Lewis &lt;zachcanbereached@gmail.com&gt;
diff --git a/src/cmake/build_minizip-ng.cmake b/src/cmake/build_minizip-ng.cmake
@@ -45,8 +45,6 @@ build_dependency_with_cmake(minizip-ng
         -D MZ_ICONV=OFF
         -D MZ_FETCH_LIBS=OFF
         -D MZ_FORCE_FETCH_LIBS=OFF
-        -D ZLIB_LIBRARY=${ZLIB_LIBRARIES}
-        -D ZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}
     )
 
 
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
@@ -47,6 +47,7 @@ if (ENABLE_ZLIBNG)
     if (ALLOW_ZLIB)
         checked_find_package (ZLIB PREFER_CONFIG REQUIRED)
     else ()
+        # This assumption will hold until zlib-1.3.2 is released.
         checked_find_package (ZLIB CONFIG REQUIRED)
     endif ()
 else ()

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ build_dependency_with_cmake(minizip-ng`
`45`	`45`	`-D MZ_ICONV=OFF`
`46`	`46`	`-D MZ_FETCH_LIBS=OFF`
`47`	`47`	`-D MZ_FORCE_FETCH_LIBS=OFF`
`48`		`- -D ZLIB_LIBRARY=${ZLIB_LIBRARIES}`
`49`		`- -D ZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}`
`50`	`48`	`)`
`51`	`49`
`52`	`50`