From 78b1f2bdf3a7b6ee5aa7148e88f6d6f53f4c7e10 Mon Sep 17 00:00:00 2001 From: willson-chen Date: Wed, 6 May 2020 17:17:33 +0800 Subject: CMakeLists.txt: zlib is enabled implicitly zlib is enabled only when ENABLE_PNG or ENABLE_GD_FORMATS is on. --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index dbe78e6..9004394 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,12 @@ else (USE_EXT_GD) include(AC_HEADER_STDC) include(CheckPrototypeExists) + if (ENABLE_GD_FORMATS) + FIND_PACKAGE(ZLIB) + endif (ENABLE_GD_FORMATS) + if (ENABLE_PNG) + FIND_PACKAGE(ZLIB) FIND_PACKAGE(PNG REQUIRED) endif (ENABLE_PNG) @@ -108,8 +113,6 @@ else (USE_EXT_GD) FIND_PACKAGE(ICONV REQUIRED) endif (ENABLE_ICONV) - FIND_PACKAGE(ZLIB) - IF (ENABLE_WEBP) FIND_PACKAGE(WEBP) ENDIF (ENABLE_WEBP) -- cgit v1.2.1