util/zlib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMake: Avoid double inclusion of CPack warning.

Browse source
This commit is contained in:
Vollstrecker 2024-12-30 10:56:46 +01:00 • committed by Mark Adler
parent 15a3751836
commit f42008f5b4
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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)

4
contrib/minizip/CMakeLists.txt
View file

@ -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)