diff options
| author | Vollstrecker <werner@vollstreckernet.de> | 2025-12-25 18:03:46 +0100 |
|---|---|---|
| committer | Mark Adler <git@madler.net> | 2026-01-12 10:46:34 -0800 |
| commit | 3a85de5fcbf1686187d8c43f13b78ac6fc0df8ac (patch) | |
| tree | 86d4ba97b3572fe969a7e566ad4f4dd27ee01d3d | |
| parent | 6598de3581a2c3301a2cdddadeb8f07cf5995816 (diff) | |
| download | zlib-3a85de5fcbf1686187d8c43f13b78ac6fc0df8ac.tar.gz zlib-3a85de5fcbf1686187d8c43f13b78ac6fc0df8ac.tar.bz2 zlib-3a85de5fcbf1686187d8c43f13b78ac6fc0df8ac.zip | |
CMake: Move contrib options out of main file.
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | contrib/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 4 deletions
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) | |||
| 22 | option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON) | 22 | option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON) |
| 23 | option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON) | 23 | option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON) |
| 24 | option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON) | 24 | option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON) |
| 25 | option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF) | ||
| 26 | option(ZLIB_INSTALL "Enable installation of zlib" ON) | 25 | option(ZLIB_INSTALL "Enable installation of zlib" ON) |
| 27 | option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in" | 26 | option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in" |
| 28 | OFF) | 27 | OFF) |
| @@ -325,6 +324,4 @@ if(ZLIB_BUILD_TESTING) | |||
| 325 | add_subdirectory(test) | 324 | add_subdirectory(test) |
| 326 | endif(ZLIB_BUILD_TESTING) | 325 | endif(ZLIB_BUILD_TESTING) |
| 327 | 326 | ||
| 328 | if(ZLIB_BUILD_MINIZIP) | 327 | add_subdirectory(contrib) |
| 329 | add_subdirectory(contrib/minizip/) | ||
| 330 | endif(ZLIB_BUILD_MINIZIP) | ||
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 @@ | |||
| 1 | option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF) | ||
| 2 | |||
| 3 | if(ZLIB_BUILD_MINIZIP) | ||
| 4 | add_subdirectory(minizip/) | ||
| 5 | endif(ZLIB_BUILD_MINIZIP) | ||
