From 3a85de5fcbf1686187d8c43f13b78ac6fc0df8ac Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Thu, 25 Dec 2025 18:03:46 +0100 Subject: CMake: Move contrib options out of main file. --- CMakeLists.txt | 5 +---- contrib/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 contrib/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index aa735912..1e94f80e 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 00000000..ac6e9355 --- /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) -- cgit v1.2.3-55-g6feb