[Bf-blender-cvs] [71b635fb5a3] tmp-vfx-platform-2023: Fix missing minizipng dependency on zlib, build error on macOS
Brecht Van Lommel
noreply at git.blender.org
Mon Nov 7 22:52:48 CET 2022
Commit: 71b635fb5a3bb70811173abd23117f7139355591
Author: Brecht Van Lommel
Date: Mon Nov 7 22:40:28 2022 +0100
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB71b635fb5a3bb70811173abd23117f7139355591
Fix missing minizipng dependency on zlib, build error on macOS
===================================================================
M build_files/build_environment/cmake/minizipng.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/minizipng.cmake b/build_files/build_environment/cmake/minizipng.cmake
index ae121a7a8aa..e59b4c8826d 100644
--- a/build_files/build_environment/cmake/minizipng.cmake
+++ b/build_files/build_environment/cmake/minizipng.cmake
@@ -2,6 +2,7 @@
set(MINIZIPNG_EXTRA_ARGS
-DMZ_FETCH_LIBS=OFF
+ -DMZ_LIBCOMP=OFF
-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
# Because OCIO hardcodes a non standard include path
@@ -17,3 +18,8 @@ ExternalProject_Add(external_minizipng
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/minizipng ${DEFAULT_CMAKE_FLAGS} ${MINIZIPNG_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/minizipng
)
+
+add_dependencies(
+ external_minizipng
+ external_zlib
+)
More information about the Bf-blender-cvs
mailing list