diff options
author | Vollstrecker <werner@vollstreckernet.de> | 2025-01-22 17:05:05 +0100 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2025-01-31 20:02:26 -0800 |
commit | 213998f2b0dbe21b50f18c242ddb43b34e79b75f (patch) | |
tree | a024d7632b5c5bb499ab4270ea3ebc1febc92380 /contrib | |
parent | 734f974753571310fdf6c73ba38f17362dcf71ba (diff) | |
download | zlib-213998f2b0dbe21b50f18c242ddb43b34e79b75f.tar.gz zlib-213998f2b0dbe21b50f18c242ddb43b34e79b75f.tar.bz2 zlib-213998f2b0dbe21b50f18c242ddb43b34e79b75f.zip |
CMake: Include bzip2 in the interface.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/minizip/CMakeLists.txt | 17 | ||||
-rw-r--r-- | contrib/minizip/minizipConfig.cmake.in | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt index 38d870f..b0ed62c 100644 --- a/contrib/minizip/CMakeLists.txt +++ b/contrib/minizip/CMakeLists.txt | |||
@@ -129,11 +129,11 @@ if(MINIZIP_BUILD_SHARED) | |||
129 | target_compile_definitions( | 129 | target_compile_definitions( |
130 | libminizip | 130 | libminizip |
131 | PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> | 131 | PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> |
132 | $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1> | ||
133 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> | 132 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> |
134 | $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1> | 133 | $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1> |
135 | $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1> | 134 | $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1> |
136 | PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>) | 135 | PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1> |
136 | $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>) | ||
137 | 137 | ||
138 | if(NOT CYGWIN) | 138 | if(NOT CYGWIN) |
139 | set_target_properties(libminizip PROPERTIES SOVERSION | 139 | set_target_properties(libminizip PROPERTIES SOVERSION |
@@ -146,7 +146,10 @@ if(MINIZIP_BUILD_SHARED) | |||
146 | OUTPUT_NAME minizip | 146 | OUTPUT_NAME minizip |
147 | VERSION ${minizip_VERSION} | 147 | VERSION ${minizip_VERSION} |
148 | SOVERSION ${minizip_VERSION_MAJOR}) | 148 | SOVERSION ${minizip_VERSION_MAJOR}) |
149 | target_link_libraries(libminizip PUBLIC ZLIB::ZLIB) | 149 | |
150 | target_link_libraries(libminizip | ||
151 | PUBLIC ZLIB::ZLIB | ||
152 | $<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>) | ||
150 | 153 | ||
151 | add_executable(minizip ${MINIZIP_SRCS} ${MINIZIP_HDRS}) | 154 | add_executable(minizip ${MINIZIP_SRCS} ${MINIZIP_HDRS}) |
152 | set_target_properties(minizip PROPERTIES EXPORT_NAME minizip_executable) | 155 | set_target_properties(minizip PROPERTIES EXPORT_NAME minizip_executable) |
@@ -172,11 +175,11 @@ if(MINIZIP_BUILD_STATIC) | |||
172 | target_compile_definitions( | 175 | target_compile_definitions( |
173 | libminizipstatic | 176 | libminizipstatic |
174 | PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> | 177 | PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> |
175 | $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1> | ||
176 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> | 178 | $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> |
177 | $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1> | 179 | $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1> |
178 | $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1> | 180 | $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1> |
179 | PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>) | 181 | PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1> |
182 | $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>) | ||
180 | set_target_properties( | 183 | set_target_properties( |
181 | libminizipstatic PROPERTIES EXPORT_NAME minizipstatic | 184 | libminizipstatic PROPERTIES EXPORT_NAME minizipstatic |
182 | OUTPUT_NAME minizip${minizip_static_suffix}) | 185 | OUTPUT_NAME minizip${minizip_static_suffix}) |
@@ -185,7 +188,9 @@ if(MINIZIP_BUILD_STATIC) | |||
185 | set_target_properties(libminizipstatic PROPERTIES SUFFIX ".dll.a") | 188 | set_target_properties(libminizipstatic PROPERTIES SUFFIX ".dll.a") |
186 | endif(CYGWIN) | 189 | endif(CYGWIN) |
187 | 190 | ||
188 | target_link_libraries(libminizipstatic PUBLIC ZLIB::ZLIBSTATIC) | 191 | target_link_libraries(libminizipstatic PUBLIC ZLIB::ZLIBSTATIC |
192 | $<$<BOOL:${BZIP2_FOUND}>:BZip2::BZip2>) | ||
193 | |||
189 | add_executable(minizipstatic ${MINIZIP_SRCS} ${MINIZIP_HDRS}) | 194 | add_executable(minizipstatic ${MINIZIP_SRCS} ${MINIZIP_HDRS}) |
190 | set_target_properties(minizipstatic PROPERTIES EXPORT_NAME | 195 | set_target_properties(minizipstatic PROPERTIES EXPORT_NAME |
191 | minizip_static_executable) | 196 | minizip_static_executable) |
diff --git a/contrib/minizip/minizipConfig.cmake.in b/contrib/minizip/minizipConfig.cmake.in index 5456053..88ea0a0 100644 --- a/contrib/minizip/minizipConfig.cmake.in +++ b/contrib/minizip/minizipConfig.cmake.in | |||
@@ -1,8 +1,8 @@ | |||
1 | @PACKAGE_INIT@ | 1 | @PACKAGE_INIT@ |
2 | 2 | ||
3 | set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@) | ||
4 | set(_minizip_supported_components "") | 3 | set(_minizip_supported_components "") |
5 | include(CMakeFindDependencyMacro) | 4 | include(CMakeFindDependencyMacro) |
5 | |||
6 | if(@MINIZIP_BUILD_SHARED@) | 6 | if(@MINIZIP_BUILD_SHARED@) |
7 | list(APPEND _minizip_supported_components shared) | 7 | list(APPEND _minizip_supported_components shared) |
8 | endif(@MINIZIP_BUILD_SHARED@) | 8 | endif(@MINIZIP_BUILD_SHARED@) |
@@ -11,6 +11,10 @@ if(@MINIZIP_BUILD_STATIC@) | |||
11 | list(APPEND _minizip_supported_components static) | 11 | list(APPEND _minizip_supported_components static) |
12 | endif(@MINIZIP_BUILD_STATIC@) | 12 | endif(@MINIZIP_BUILD_STATIC@) |
13 | 13 | ||
14 | if(@MINIZIP_ENABLE_BZIP2@) | ||
15 | find_dependency(BZip2) | ||
16 | endif(@MINIZIP_ENABLE_BZIP2@) | ||
17 | |||
14 | if(minizip_FIND_COMPONENTS) | 18 | if(minizip_FIND_COMPONENTS) |
15 | find_dependency(ZLIB CONFIG COMPONENTS ${minizip_FIND_COMPONENTS}) | 19 | find_dependency(ZLIB CONFIG COMPONENTS ${minizip_FIND_COMPONENTS}) |
16 | 20 | ||