Commit 3a85de5 for zlib
commit 3a85de5fcbf1686187d8c43f13b78ac6fc0df8ac
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Thu Dec 25 18:03:46 2025 +0100
CMake: Move contrib options out of main file.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa73591..1e94f80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ set(CPACK_RESOURCE_FILE_README ${zlib_SOURCE_DIR}/README)
option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON)
option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON)
option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON)
-option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF)
option(ZLIB_INSTALL "Enable installation of zlib" ON)
option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in"
OFF)
@@ -325,6 +324,4 @@ if(ZLIB_BUILD_TESTING)
add_subdirectory(test)
endif(ZLIB_BUILD_TESTING)
-if(ZLIB_BUILD_MINIZIP)
- add_subdirectory(contrib/minizip/)
-endif(ZLIB_BUILD_MINIZIP)
+add_subdirectory(contrib)
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
new file mode 100644
index 0000000..ac6e935
--- /dev/null
+++ b/contrib/CMakeLists.txt
@@ -0,0 +1,5 @@
+option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF)
+
+if(ZLIB_BUILD_MINIZIP)
+ add_subdirectory(minizip/)
+endif(ZLIB_BUILD_MINIZIP)