From f42008f5b49e8fd718f38771d587f8a6b3b71b5c Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Mon, 30 Dec 2024 10:56:46 +0100 Subject: CMake: Avoid double inclusion of CPack warning. --- CMakeLists.txt | 2 ++ contrib/minizip/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9e9620..4785e1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,8 @@ include(CheckTypeSize) include(CPack) include(GNUInstallDirs) +set(CPACK_INCLUDED TRUE) + if(NOT ZLIB_CONF_WRITTEN) set(Z_PREFIX ${ZLIB_PREFIX}) 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) include(CheckTypeSize) include(GNUInstallDirs) +if(NOT CPACK_INCLUDED) + include(CPack) +endif(NOT CPACK_INCLUDED) + if(MINIZIP_ENABLE_BZIP2) find_package(BZip2) endif(MINIZIP_ENABLE_BZIP2) -- cgit v1.2.3-55-g6feb