From a5b330632daf2a158a8ea900b236a4582ba788b7 Mon Sep 17 00:00:00 2001 From: Maurice Heumann Date: Tue, 4 Feb 2025 09:49:51 +0100 Subject: [PATCH] Update zlib --- deps/zlib | 2 +- deps/zlib.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/deps/zlib b/deps/zlib index ef24c4c7..ed161079 160000 --- a/deps/zlib +++ b/deps/zlib @@ -1 +1 @@ -Subproject commit ef24c4c7502169f016dcd2a26923dbaf3216748c +Subproject commit ed1610791c0c681ee562bb3997e0f29bfae11b2d diff --git a/deps/zlib.cmake b/deps/zlib.cmake index d2a2b323..ba4cafdc 100644 --- a/deps/zlib.cmake +++ b/deps/zlib.cmake @@ -1,7 +1,11 @@ -set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) +set(ZLIB_BUILD_TESTING OFF CACHE BOOL "" FORCE) +set(ZLIB_BUILD_SHARED OFF CACHE BOOL "" FORCE) +set(ZLIB_BUILD_MINIZIP OFF CACHE BOOL "" FORCE) +set(ZLIB_INSTALL OFF CACHE BOOL "" FORCE) + add_subdirectory(zlib) target_compile_definitions(zlibstatic PUBLIC ZLIB_CONST=1) -target_include_directories(zlibstatic PUBLIC ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) +#target_include_directories(zlibstatic PUBLIC ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR}) if (TARGET zlib) set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL TRUE)