diff options
author | Vollstrecker <werner@vollstreckernet.de> | 2024-12-30 10:56:46 +0100 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:02:26 -0800 |
commit | f42008f5b49e8fd718f38771d587f8a6b3b71b5c (patch) | |
tree | 7c7e65d526dad63f5f32b07cc2a2a97a52a597c2 | |
parent | 15a3751836739a987bfd1fb73d1c2f20ef85e69b (diff) | |
download | zlib-f42008f5b49e8fd718f38771d587f8a6b3b71b5c.tar.gz zlib-f42008f5b49e8fd718f38771d587f8a6b3b71b5c.tar.bz2 zlib-f42008f5b49e8fd718f38771d587f8a6b3b71b5c.zip |
CMake: Avoid double inclusion of CPack warning.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | contrib/minizip/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f9e9620..4785e1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -47,6 +47,8 @@ include(CheckTypeSize) | |||
47 | include(CPack) | 47 | include(CPack) |
48 | include(GNUInstallDirs) | 48 | include(GNUInstallDirs) |
49 | 49 | ||
50 | set(CPACK_INCLUDED TRUE) | ||
51 | |||
50 | if(NOT ZLIB_CONF_WRITTEN) | 52 | if(NOT ZLIB_CONF_WRITTEN) |
51 | set(Z_PREFIX ${ZLIB_PREFIX}) | 53 | set(Z_PREFIX ${ZLIB_PREFIX}) |
52 | set(CONF_OUT_FILE ${zlib_BINARY_DIR}/zconf.h.cmakein) | 54 | set(CONF_OUT_FILE ${zlib_BINARY_DIR}/zconf.h.cmakein) |
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt index 2cf23d2..68aeed5 100644 --- a/contrib/minizip/CMakeLists.txt +++ b/contrib/minizip/CMakeLists.txt | |||
@@ -39,6 +39,10 @@ include(CMakePackageConfigHelpers) | |||
39 | include(CheckTypeSize) | 39 | include(CheckTypeSize) |
40 | include(GNUInstallDirs) | 40 | include(GNUInstallDirs) |
41 | 41 | ||
42 | if(NOT CPACK_INCLUDED) | ||
43 | include(CPack) | ||
44 | endif(NOT CPACK_INCLUDED) | ||
45 | |||
42 | if(MINIZIP_ENABLE_BZIP2) | 46 | if(MINIZIP_ENABLE_BZIP2) |
43 | find_package(BZip2) | 47 | find_package(BZip2) |
44 | endif(MINIZIP_ENABLE_BZIP2) | 48 | endif(MINIZIP_ENABLE_BZIP2) |