aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWerner <led-control@vollstreckernet.de>2024-12-12 06:35:57 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 19:59:10 -0800
commitaefb4b5b94be42ac148f2aaad36e23ca141618c0 (patch)
tree1cb3ecc3df14c047050862ba5de333d7b2851547 /contrib
parent5ff476ee43fda6053ec5cc6dcf974aa3eb80d98e (diff)
downloadzlib-aefb4b5b94be42ac148f2aaad36e23ca141618c0.tar.gz
zlib-aefb4b5b94be42ac148f2aaad36e23ca141618c0.tar.bz2
zlib-aefb4b5b94be42ac148f2aaad36e23ca141618c0.zip
CMake: Rename exports of minizip.
minizip-ng has prior art.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/minizip/CMakeLists.txt24
-rw-r--r--contrib/minizip/minizipConfig.cmake.in5
2 files changed, 19 insertions, 10 deletions
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index 88ded2e..23abc7a 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -121,7 +121,7 @@ if(MINIZIP_BUILD_SHARED)
121 add_library(libminizip SHARED 121 add_library(libminizip SHARED
122 ${LIBMINIZIP_SRCS} 122 ${LIBMINIZIP_SRCS}
123 ${LIBMINIZIP_HDRS}) 123 ${LIBMINIZIP_HDRS})
124 add_library(MINIZIP::MINIZIP ALIAS libminizip) 124 add_library(MINIZIP::minizip ALIAS libminizip)
125 target_include_directories(libminizip PUBLIC 125 target_include_directories(libminizip PUBLIC
126 $<BUILD_INTERFACE:${minizip_SOURCE_DIR}> 126 $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
127 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 127 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@@ -141,7 +141,7 @@ if(MINIZIP_BUILD_SHARED)
141 endif(NOT CYGWIN) 141 endif(NOT CYGWIN)
142 142
143 set_target_properties(libminizip PROPERTIES 143 set_target_properties(libminizip PROPERTIES
144 EXPORT_NAME MINIZIP 144 EXPORT_NAME minizip
145 OUTPUT_NAME minizip 145 OUTPUT_NAME minizip
146 VERSIOM ${minizip_VERSION} 146 VERSIOM ${minizip_VERSION}
147 SOVERSION ${minizip_VERSION_MAJOR}) 147 SOVERSION ${minizip_VERSION_MAJOR})
@@ -153,20 +153,24 @@ if(MINIZIP_BUILD_SHARED)
153 add_executable(minizip 153 add_executable(minizip
154 ${MINIZIP_SRCS} 154 ${MINIZIP_SRCS}
155 ${MINIZIP_HDRS}) 155 ${MINIZIP_HDRS})
156 set_target_properties(minizip PROPERTIES
157 EXPORT_NAME minizip_executable)
156 target_compile_definitions(minizip 158 target_compile_definitions(minizip
157 PRIVATE 159 PRIVATE
158 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> 160 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
159 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) 161 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
160 target_link_libraries(minizip PRIVATE MINIZIP::MINIZIP) 162 target_link_libraries(minizip PRIVATE MINIZIP::minizip)
161 163
162 add_executable(miniunzip 164 add_executable(miniunzip
163 ${MINIUNZIP_SRCS} 165 ${MINIUNZIP_SRCS}
164 ${MINIUNZIP_HDRS}) 166 ${MINIUNZIP_HDRS})
167 set_target_properties(miniunzip PROPERTIES
168 EXPORT_NAME miniunzip_executable)
165 target_compile_definitions(miniunzip 169 target_compile_definitions(miniunzip
166 PRIVATE 170 PRIVATE
167 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> 171 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
168 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) 172 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
169 target_link_libraries(miniunzip PRIVATE MINIZIP::MINIZIP) 173 target_link_libraries(miniunzip PRIVATE MINIZIP::minizip)
170endif(MINIZIP_BUILD_SHARED) 174endif(MINIZIP_BUILD_SHARED)
171 175
172if(MINIZIP_BUILD_STATIC) 176if(MINIZIP_BUILD_STATIC)
@@ -174,7 +178,7 @@ if(MINIZIP_BUILD_STATIC)
174 add_library(libminizipstatic STATIC 178 add_library(libminizipstatic STATIC
175 ${LIBMINIZIP_SRCS} 179 ${LIBMINIZIP_SRCS}
176 ${LIBMINIZIP_HDRS}) 180 ${LIBMINIZIP_HDRS})
177 add_library(MINIZIP::MINIZIPSTATIC ALIAS libminizipstatic) 181 add_library(MINIZIP::minizipstatic ALIAS libminizipstatic)
178 target_include_directories(libminizipstatic PUBLIC 182 target_include_directories(libminizipstatic PUBLIC
179 $<BUILD_INTERFACE:${minizip_SOURCE_DIR}> 183 $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
180 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 184 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@@ -188,7 +192,7 @@ if(MINIZIP_BUILD_STATIC)
188 PUBLIC 192 PUBLIC
189 $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>) 193 $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
190 set_target_properties(libminizipstatic PROPERTIES 194 set_target_properties(libminizipstatic PROPERTIES
191 EXPORT_NAME MINIZIPSTATIC 195 EXPORT_NAME minizipstatic
192 OUTPUT_NAME minizip${minizip_static_suffix}) 196 OUTPUT_NAME minizip${minizip_static_suffix})
193 197
194 if(CYGWIN) 198 if(CYGWIN)
@@ -204,20 +208,24 @@ if(MINIZIP_BUILD_STATIC)
204 add_executable(minizipstatic 208 add_executable(minizipstatic
205 ${MINIZIP_SRCS} 209 ${MINIZIP_SRCS}
206 ${MINIZIP_HDRS}) 210 ${MINIZIP_HDRS})
211 set_target_properties(minizipstatic PROPERTIES
212 EXPORT_NAME minizip_static_executable)
207 target_compile_definitions(minizipstatic 213 target_compile_definitions(minizipstatic
208 PRIVATE 214 PRIVATE
209 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> 215 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
210 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) 216 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
211 target_link_libraries(minizipstatic PRIVATE MINIZIP::MINIZIPSTATIC) 217 target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic)
212 218
213 add_executable(miniunzipstatic 219 add_executable(miniunzipstatic
214 ${MINIUNZIP_SRCS} 220 ${MINIUNZIP_SRCS}
215 ${MINIUNZIP_HDRS}) 221 ${MINIUNZIP_HDRS})
222 set_target_properties(miniunzipstatic PROPERTIES
223 EXPORT_NAME miniunzip_static_executable)
216 target_compile_definitions(miniunzipstatic 224 target_compile_definitions(miniunzipstatic
217 PRIVATE 225 PRIVATE
218 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> 226 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
219 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) 227 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
220 target_link_libraries(miniunzipstatic PRIVATE MINIZIP::MINIZIPSTATIC) 228 target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic)
221endif(MINIZIP_BUILD_STATIC) 229endif(MINIZIP_BUILD_STATIC)
222 230
223if(MINIZIP_INSTALL) 231if(MINIZIP_INSTALL)
diff --git a/contrib/minizip/minizipConfig.cmake.in b/contrib/minizip/minizipConfig.cmake.in
index 5221bfe..9c95fd6 100644
--- a/contrib/minizip/minizipConfig.cmake.in
+++ b/contrib/minizip/minizipConfig.cmake.in
@@ -1,5 +1,6 @@
1set(minizip_VERSION @minizip_VERSION@) 1set(minizip_VERSION @minizip_VERSION@)
2set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@ 2set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@)
3@PACKAGE_INIT@ 3@PACKAGE_INIT@
4INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake) 4include(CMakeFindDependencyMacro)
5find_dependency(zlib) 5find_dependency(zlib)
6INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake)