aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt5
-rw-r--r--contrib/CMakeLists.txt5
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)
22option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON) 22option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON)
23option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON) 23option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON)
24option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON) 24option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON)
25option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF)
26option(ZLIB_INSTALL "Enable installation of zlib" ON) 25option(ZLIB_INSTALL "Enable installation of zlib" ON)
27option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in" 26option(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)
326endif(ZLIB_BUILD_TESTING) 325endif(ZLIB_BUILD_TESTING)
327 326
328if(ZLIB_BUILD_MINIZIP) 327add_subdirectory(contrib)
329 add_subdirectory(contrib/minizip/)
330endif(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 @@
1option(ZLIB_BUILD_MINIZIP "Enable building libminizip contrib library" OFF)
2
3if(ZLIB_BUILD_MINIZIP)
4 add_subdirectory(minizip/)
5endif(ZLIB_BUILD_MINIZIP)