aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2025-01-03 09:50:16 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 20:02:26 -0800
commit8b8a124eb42b027dceab01c7d4942a18c756d28e (patch)
treebc8d9427d1689be996af87276e3a6d3371cae267 /contrib
parent4f2671d50cf0f8632c9f6e84b884aba5031e4016 (diff)
downloadzlib-8b8a124eb42b027dceab01c7d4942a18c756d28e.tar.gz
zlib-8b8a124eb42b027dceab01c7d4942a18c756d28e.tar.bz2
zlib-8b8a124eb42b027dceab01c7d4942a18c756d28e.zip
CMake: Add cmake-format.yaml and reformat the cmake files.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/minizip/CMakeLists.txt391
-rw-r--r--contrib/minizip/minizipConfig.cmake.in2
-rw-r--r--contrib/minizip/test/CMakeLists.txt146
-rw-r--r--contrib/minizip/test/add_subdirectory_exclude_test.cmake.in9
-rw-r--r--contrib/minizip/test/add_subdirectory_test.cmake.in6
-rw-r--r--contrib/minizip/test/find_package_test.cmake.in6
6 files changed, 265 insertions, 295 deletions
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index fd43e82..f252002 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -1,6 +1,7 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(minizip 3project(
4 minizip
4 VERSION 1.0.0 5 VERSION 1.0.0
5 LANGUAGES C 6 LANGUAGES C
6 DESCRIPTION "A library for creating zipfiles based in zlib" 7 DESCRIPTION "A library for creating zipfiles based in zlib"
@@ -11,17 +12,17 @@ if(CMAKE_SIZEOF_VOID_P LESS 8 AND NOT MINGW)
11 return() 12 return()
12endif(CMAKE_SIZEOF_VOID_P LESS 8 AND NOT MINGW) 13endif(CMAKE_SIZEOF_VOID_P LESS 8 AND NOT MINGW)
13 14
14#============================================================================ 15# ============================================================================
15# CPack 16# CPack
16#============================================================================ 17# ============================================================================
17set(CPACK_PACKAGE_VENDOR "zlib-Project") 18set(CPACK_PACKAGE_VENDOR "zlib-Project")
18set(CPACK_PACKAGE_DESCRIPTION_FILE ${minizip_SOURCE_DIR}/MiniZip64_info.txt) 19set(CPACK_PACKAGE_DESCRIPTION_FILE ${minizip_SOURCE_DIR}/MiniZip64_info.txt)
19set(CPACK_RESOURCE_FILE_LICENSE ${minizip_SOURCE_DIR}/../../LICENSE) 20set(CPACK_RESOURCE_FILE_LICENSE ${minizip_SOURCE_DIR}/../../LICENSE)
20set(CPACK_RESOURCE_FILE_README ${minizip_SOURCE_DIR}/MiniZip64_info.txt) 21set(CPACK_RESOURCE_FILE_README ${minizip_SOURCE_DIR}/MiniZip64_info.txt)
21 22
22#============================================================================ 23# ============================================================================
23# configuration 24# configuration
24#============================================================================ 25# ============================================================================
25option(MINIZIP_BUILD_SHARED "Enable building minizip shared library" ON) 26option(MINIZIP_BUILD_SHARED "Enable building minizip shared library" ON)
26option(MINIZIP_BUILD_STATIC "Enable building minizip static library" ON) 27option(MINIZIP_BUILD_STATIC "Enable building minizip static library" ON)
27option(MINIZIP_BUILD_TESTING "Enable testing of minizip" ON) 28option(MINIZIP_BUILD_TESTING "Enable testing of minizip" ON)
@@ -92,40 +93,17 @@ if(NOT TARGET ZLIB::ZLIB)
92 find_package(ZLIB REQUIRED CONFIG) 93 find_package(ZLIB REQUIRED CONFIG)
93endif(NOT TARGET ZLIB::ZLIB) 94endif(NOT TARGET ZLIB::ZLIB)
94 95
95set(LIBMINIZIP_SRCS 96set(LIBMINIZIP_SRCS ioapi.c mztools.c unzip.c zip.c)
96 ioapi.c
97 mztools.c
98 unzip.c
99 zip.c)
100 97
101set(LIBMINIZIP_HDRS 98set(LIBMINIZIP_HDRS crypt.h ints.h ioapi.h mztools.h unzip.h zip.h)
102 crypt.h
103 ints.h
104 ioapi.h
105 mztools.h
106 unzip.h
107 zip.h)
108 99
109set(MINIZIP_SRCS 100set(MINIZIP_SRCS ioapi.c $<$<BOOL:${WIN32}>:iowin32.c> minizip.c zip.c)
110 ioapi.c
111 $<$<BOOL:${WIN32}>:iowin32.c>
112 minizip.c
113 zip.c)
114 101
115set(MINIZIP_HDRS 102set(MINIZIP_HDRS crypt.h ints.h ioapi.h $<$<BOOL:${WIN32}>:iowin32.h> skipset.h
116 crypt.h 103 zip.h)
117 ints.h
118 ioapi.h
119 $<$<BOOL:${WIN32}>:iowin32.h>
120 skipset.h
121 zip.h)
122 104
123set(MINIUNZIP_SRCS 105set(MINIUNZIP_SRCS ioapi.c $<$<BOOL:${WIN32}>:iowin32.c> miniunz.c unzip.c
124 ioapi.c 106 zip.c)
125 $<$<BOOL:${WIN32}>:iowin32.c>
126 miniunz.c
127 unzip.c
128 zip.c)
129 107
130set(MINIUNZIP_HDRS 108set(MINIUNZIP_HDRS
131 crypt.h 109 crypt.h
@@ -143,261 +121,258 @@ endif(WIN32)
143 121
144if(MINIZIP_BUILD_SHARED) 122if(MINIZIP_BUILD_SHARED)
145 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) 123 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
146 add_library(libminizip SHARED 124 add_library(libminizip SHARED ${LIBMINIZIP_SRCS} ${LIBMINIZIP_HDRS})
147 ${LIBMINIZIP_SRCS}
148 ${LIBMINIZIP_HDRS})
149 add_library(MINIZIP::minizip ALIAS libminizip) 125 add_library(MINIZIP::minizip ALIAS libminizip)
150 target_include_directories(libminizip PUBLIC 126 target_include_directories(
151 $<BUILD_INTERFACE:${minizip_SOURCE_DIR}> 127 libminizip PUBLIC $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
152 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 128 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
153 target_compile_definitions(libminizip 129 target_compile_definitions(
154 PRIVATE 130 libminizip
155 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> 131 PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
156 $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1> 132 $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
157 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> 133 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
158 $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1> 134 $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
159 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1> 135 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>
160 PUBLIC 136 PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
161 $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
162 137
163 if(NOT CYGWIN) 138 if(NOT CYGWIN)
164 set_target_properties(libminizip PROPERTIES 139 set_target_properties(libminizip PROPERTIES SOVERSION
165 SOVERSION ${minizip_VERSION_MAJOR}) 140 ${minizip_VERSION_MAJOR})
166 endif(NOT CYGWIN) 141 endif(NOT CYGWIN)
167 142
168 set_target_properties(libminizip PROPERTIES 143 set_target_properties(
169 EXPORT_NAME minizip 144 libminizip
170 OUTPUT_NAME minizip 145 PROPERTIES EXPORT_NAME minizip
171 VERSIOM ${minizip_VERSION} 146 OUTPUT_NAME minizip
172 SOVERSION ${minizip_VERSION_MAJOR}) 147 VERSIOM ${minizip_VERSION}
148 SOVERSION ${minizip_VERSION_MAJOR})
173 target_link_libraries(libminizip PUBLIC ZLIB::ZLIB) 149 target_link_libraries(libminizip PUBLIC ZLIB::ZLIB)
174 150
175 add_executable(minizip 151 add_executable(minizip ${MINIZIP_SRCS} ${MINIZIP_HDRS})
176 ${MINIZIP_SRCS} 152 set_target_properties(minizip PROPERTIES EXPORT_NAME minizip_executable)
177 ${MINIZIP_HDRS}) 153 target_compile_definitions(
178 set_target_properties(minizip PROPERTIES 154 minizip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
179 EXPORT_NAME minizip_executable) 155 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
180 target_compile_definitions(minizip
181 PRIVATE
182 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
183 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
184 target_link_libraries(minizip PRIVATE MINIZIP::minizip) 156 target_link_libraries(minizip PRIVATE MINIZIP::minizip)
185 add_executable(miniunzip 157 add_executable(miniunzip ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS})
186 ${MINIUNZIP_SRCS} 158 set_target_properties(miniunzip PROPERTIES EXPORT_NAME miniunzip_executable)
187 ${MINIUNZIP_HDRS}) 159 target_compile_definitions(
188 set_target_properties(miniunzip PROPERTIES 160 miniunzip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
189 EXPORT_NAME miniunzip_executable) 161 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
190 target_compile_definitions(miniunzip
191 PRIVATE
192 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
193 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
194 target_link_libraries(miniunzip PRIVATE MINIZIP::minizip) 162 target_link_libraries(miniunzip PRIVATE MINIZIP::minizip)
195endif(MINIZIP_BUILD_SHARED) 163endif(MINIZIP_BUILD_SHARED)
196 164
197if(MINIZIP_BUILD_STATIC) 165if(MINIZIP_BUILD_STATIC)
198 add_library(libminizipstatic STATIC 166 add_library(libminizipstatic STATIC ${LIBMINIZIP_SRCS} ${LIBMINIZIP_HDRS})
199 ${LIBMINIZIP_SRCS}
200 ${LIBMINIZIP_HDRS})
201 add_library(MINIZIP::minizipstatic ALIAS libminizipstatic) 167 add_library(MINIZIP::minizipstatic ALIAS libminizipstatic)
202 target_include_directories(libminizipstatic PUBLIC 168 target_include_directories(
203 $<BUILD_INTERFACE:${minizip_SOURCE_DIR}> 169 libminizipstatic
204 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 170 PUBLIC $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
205 target_compile_definitions(libminizipstatic 171 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
206 PRIVATE 172 target_compile_definitions(
207 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> 173 libminizipstatic
208 $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1> 174 PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
209 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> 175 $<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
210 $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1> 176 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
211 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1> 177 $<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
212 PUBLIC 178 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>
213 $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>) 179 PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
214 set_target_properties(libminizipstatic PROPERTIES 180 set_target_properties(
215 EXPORT_NAME minizipstatic 181 libminizipstatic PROPERTIES EXPORT_NAME minizipstatic
216 OUTPUT_NAME minizip${minizip_static_suffix}) 182 OUTPUT_NAME minizip${minizip_static_suffix})
217 183
218 if(CYGWIN) 184 if(CYGWIN)
219 set_target_properties(libminizipstatic PROPERTIES 185 set_target_properties(libminizipstatic PROPERTIES SUFFIX ".dll.a")
220 SUFFIX ".dll.a")
221 endif(CYGWIN) 186 endif(CYGWIN)
222 187
223 target_link_libraries(libminizipstatic PUBLIC ZLIB::ZLIBSTATIC) 188 target_link_libraries(libminizipstatic PUBLIC ZLIB::ZLIBSTATIC)
224 add_executable(minizipstatic 189 add_executable(minizipstatic ${MINIZIP_SRCS} ${MINIZIP_HDRS})
225 ${MINIZIP_SRCS} 190 set_target_properties(minizipstatic PROPERTIES EXPORT_NAME
226 ${MINIZIP_HDRS}) 191 minizip_static_executable)
227 set_target_properties(minizipstatic PROPERTIES 192 target_compile_definitions(
228 EXPORT_NAME minizip_static_executable) 193 minizipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
229 target_compile_definitions(minizipstatic 194 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
230 PRIVATE
231 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
232 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
233 target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic) 195 target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic)
234 add_executable(miniunzipstatic 196 add_executable(miniunzipstatic ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS})
235 ${MINIUNZIP_SRCS} 197 set_target_properties(miniunzipstatic
236 ${MINIUNZIP_HDRS}) 198 PROPERTIES EXPORT_NAME miniunzip_static_executable)
237 set_target_properties(miniunzipstatic PROPERTIES 199 target_compile_definitions(
238 EXPORT_NAME miniunzip_static_executable) 200 miniunzipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
239 target_compile_definitions(miniunzipstatic 201 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
240 PRIVATE
241 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
242 $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
243 target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic) 202 target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic)
244endif(MINIZIP_BUILD_STATIC) 203endif(MINIZIP_BUILD_STATIC)
245 204
246if(MINIZIP_INSTALL) 205if(MINIZIP_INSTALL)
247 if(MINIZIP_BUILD_SHARED) 206 if(MINIZIP_BUILD_SHARED)
248 install(TARGETS libminizip minizip miniunzip 207 install(
208 TARGETS libminizip minizip miniunzip
249 COMPONENT Runtime 209 COMPONENT Runtime
250 EXPORT minizipSharedExport 210 EXPORT minizipSharedExport
251 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" 211 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
252 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" 212 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
253 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") 213 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
254 install(EXPORT minizipSharedExport 214 install(
255 FILE minizip-shared.cmake 215 EXPORT minizipSharedExport
256 NAMESPACE MINIZIP:: 216 FILE minizip-shared.cmake
257 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) 217 NAMESPACE MINIZIP::
218 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
258 if(MINIZIP_INSTALL_COMPAT_DLL) 219 if(MINIZIP_INSTALL_COMPAT_DLL)
259 install(FILES $<TARGET_FILE:libminizip> 220 install(
221 FILES $<TARGET_FILE:libminizip>
260 COMPONENT Runtime 222 COMPONENT Runtime
261 RENAME libminizip-${minizip_VERSION_MAJOR}.dll 223 RENAME libminizip-${minizip_VERSION_MAJOR}.dll
262 DESTINATION "${CMAKE_INSTALL_BINDIR}") 224 DESTINATION "${CMAKE_INSTALL_BINDIR}")
263 endif(MINIZIP_INSTALL_COMPAT_DLL) 225 endif(MINIZIP_INSTALL_COMPAT_DLL)
264 226
265 if(MSVC) 227 if(MSVC)
266 install(FILES $<TARGET_PDB_FILE:libminizip> 228 install(
229 FILES $<TARGET_PDB_FILE:libminizip>
267 COMPONENT Runtime 230 COMPONENT Runtime
268 DESTINATION ${CMAKE_INSTALL_BINDIR} 231 DESTINATION ${CMAKE_INSTALL_BINDIR}
269 CONFIGURATIONS Debug OR RelWithDebInfo 232 CONFIGURATIONS Debug OR RelWithDebInfo
270 OPTIONAL 233 OPTIONAL)
271 )
272 endif(MSVC) 234 endif(MSVC)
273 endif(MINIZIP_BUILD_SHARED) 235 endif(MINIZIP_BUILD_SHARED)
274 236
275 if(MINIZIP_BUILD_STATIC) 237 if(MINIZIP_BUILD_STATIC)
276 install(TARGETS libminizipstatic 238 install(
277 COMPONENT Development 239 TARGETS libminizipstatic
278 TARGETS minizipstatic miniunzipstatic 240 COMPONENT Development
279 COMPONENT Runtime 241 TARGETS minizipstatic miniunzipstatic
242 COMPONENT Runtime
280 EXPORT minizipStaticExport 243 EXPORT minizipStaticExport
281 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" 244 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
282 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" 245 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
283 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") 246 LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
284 install(EXPORT minizipStaticExport 247 install(
285 FILE minizip-static.cmake 248 EXPORT minizipStaticExport
286 NAMESPACE MINIZIP:: 249 FILE minizip-static.cmake
287 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) 250 NAMESPACE MINIZIP::
251 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
288 endif(MINIZIP_BUILD_STATIC) 252 endif(MINIZIP_BUILD_STATIC)
289 253
290 configure_package_config_file(${minizip_SOURCE_DIR}/minizipConfig.cmake.in 254 configure_package_config_file(
255 ${minizip_SOURCE_DIR}/minizipConfig.cmake.in
291 ${minizip_BINARY_DIR}/minizipConfig.cmake 256 ${minizip_BINARY_DIR}/minizipConfig.cmake
292 INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) 257 INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
293 write_basic_package_version_file( 258 write_basic_package_version_file(
294 "${minizip_BINARY_DIR}/minizipConfigVersion.cmake" 259 "${minizip_BINARY_DIR}/minizipConfigVersion.cmake"
295 VERSION "${minizip_VERSION}" 260 VERSION "${minizip_VERSION}"
296 COMPATIBILITY AnyNewerVersion) 261 COMPATIBILITY AnyNewerVersion)
297 install(FILES 262 install(FILES ${minizip_BINARY_DIR}/minizipConfig.cmake
298 ${minizip_BINARY_DIR}/minizipConfig.cmake 263 ${minizip_BINARY_DIR}/minizipConfigVersion.cmake
299 ${minizip_BINARY_DIR}/minizipConfigVersion.cmake 264 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
300 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) 265 install(
301 install(FILES ${LIBMINIZIP_HDRS} 266 FILES ${LIBMINIZIP_HDRS}
302 COMPONENT Development 267 COMPONENT Development
303 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") 268 DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
304endif(MINIZIP_INSTALL) 269endif(MINIZIP_INSTALL)
305 270
306if(MINIZIP_BUILD_TESTING) 271if(MINIZIP_BUILD_TESTING)
307 enable_testing() 272 enable_testing()
308 273
309 if(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 274 if(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL
310 add_test(NAME minizip_prepare_shared_zip 275 ".dll")
311 COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON 276 add_test(
312 -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm 277 NAME minizip_prepare_shared_zip
278 COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON -P
279 ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
313 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 280 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
314 add_test(NAME minizip_zipping_test_file_shared 281 add_test(
282 NAME minizip_zipping_test_file_shared
315 COMMAND minizip test_file_shared.zip test_file_shared.txt 283 COMMAND minizip test_file_shared.zip test_file_shared.txt
316 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 284 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
317 add_test(NAME minizip_prepare_shared_unzip 285 add_test(
318 COMMAND ${CMAKE_COMMAND} -DMOVE_SHARED=ON 286 NAME minizip_prepare_shared_unzip
319 -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm 287 COMMAND ${CMAKE_COMMAND} -DMOVE_SHARED=ON -P
288 ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
320 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 289 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
321 add_test(NAME minizip_miniunzipping_test_file_shared.zip 290 add_test(
291 NAME minizip_miniunzipping_test_file_shared.zip
322 COMMAND miniunzip test_file_shared.zip 292 COMMAND miniunzip test_file_shared.zip
323 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 293 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
324 add_test(NAME minizip_compare_shared 294 add_test(
325 COMMAND ${CMAKE_COMMAND} -E compare_files 295 NAME minizip_compare_shared
326 test_file_shared.txt test_file_shared.orig 296 COMMAND ${CMAKE_COMMAND} -E compare_files test_file_shared.txt
297 test_file_shared.orig
327 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 298 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
328 add_test(NAME minizip_clean_shared_zip 299 add_test(
329 COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON 300 NAME minizip_clean_shared_zip
330 -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm 301 COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON -P
302 ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
331 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 303 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
332 set_tests_properties(minizip_prepare_shared_zip 304 set_tests_properties(minizip_prepare_shared_zip
333 PROPERTIES 305 PROPERTIES FIXTURES_SETUP prepare_shared)
334 FIXTURES_SETUP prepare_shared) 306 set_tests_properties(
335 set_tests_properties(minizip_zipping_test_file_shared 307 minizip_zipping_test_file_shared
336 PROPERTIES 308 PROPERTIES FIXTURES_REQUIRED prepare_shared FIXTURES_SETUP
337 FIXTURES_REQUIRED prepare_shared 309 zip_shared)
338 FIXTURES_SETUP zip_shared) 310 set_tests_properties(
339 set_tests_properties(minizip_prepare_shared_unzip 311 minizip_prepare_shared_unzip
340 PROPERTIES 312 PROPERTIES FIXTURES_REQUIRED zip_shared FIXTURES_SETUP
341 FIXTURES_REQUIRED zip_shared 313 prepare_unzip_shared)
342 FIXTURES_SETUP prepare_unzip_shared) 314 set_tests_properties(
343 set_tests_properties(minizip_miniunzipping_test_file_shared.zip 315 minizip_miniunzipping_test_file_shared.zip
344 PROPERTIES 316 PROPERTIES FIXTURES_REQUIRED prepare_unzip_shared FIXTURES_SETUP
345 FIXTURES_REQUIRED prepare_unzip_shared 317 prepare_compare_shared)
346 FIXTURES_SETUP prepare_compare_shared) 318 set_tests_properties(
347 set_tests_properties(minizip_compare_shared 319 minizip_compare_shared
348 PROPERTIES 320 PROPERTIES FIXTURES_REQUIRED prepare_compare_shared FIXTURES_SETUP
349 FIXTURES_REQUIRED prepare_compare_shared 321 compared_shared)
350 FIXTURES_SETUP compared_shared)
351 set_tests_properties(minizip_clean_shared_zip 322 set_tests_properties(minizip_clean_shared_zip
352 PROPERTIES 323 PROPERTIES FIXTURES_CLEANUP compared_shared)
353 FIXTURES_CLEANUP compared_shared) 324 endif(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL
354 endif(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") 325 ".dll")
355 326
356 if(MINIZIP_BUILD_STATIC) 327 if(MINIZIP_BUILD_STATIC)
357 add_test(NAME minizip_prepare_static_zip 328 add_test(
358 COMMAND ${CMAKE_COMMAND} -DCREATE_STATIC=ON 329 NAME minizip_prepare_static_zip
359 -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm 330 COMMAND ${CMAKE_COMMAND} -DCREATE_STATIC=ON -P
331 ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
360 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 332 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
361 add_test(NAME minizip_zipping_test_file_static 333 add_test(
334 NAME minizip_zipping_test_file_static
362 COMMAND minizipstatic test_file_static.zip test_file_static.txt 335 COMMAND minizipstatic test_file_static.zip test_file_static.txt
363 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 336 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
364 add_test(NAME minizip_prepare_static_unzip 337 add_test(
365 COMMAND ${CMAKE_COMMAND} -DMOVE_STATIC=ON 338 NAME minizip_prepare_static_unzip
366 -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm 339 COMMAND ${CMAKE_COMMAND} -DMOVE_STATIC=ON -P
340 ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
367 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 341 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
368 add_test(NAME minizip_miniunzipping_test_file_static.zip 342 add_test(
343 NAME minizip_miniunzipping_test_file_static.zip
369 COMMAND miniunzipstatic test_file_static.zip 344 COMMAND miniunzipstatic test_file_static.zip
370 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 345 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
371 add_test(NAME minizip_compare_static 346 add_test(
372 COMMAND ${CMAKE_COMMAND} -E compare_files 347 NAME minizip_compare_static
373 test_file_static.txt test_file_static.orig 348 COMMAND ${CMAKE_COMMAND} -E compare_files test_file_static.txt
349 test_file_static.orig
374 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 350 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
375 add_test(NAME minizip_clean_static_zip 351 add_test(
376 COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON 352 NAME minizip_clean_static_zip
377 -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm 353 COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON -P
354 ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm
378 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) 355 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
379 set_tests_properties(minizip_prepare_static_zip 356 set_tests_properties(minizip_prepare_static_zip
380 PROPERTIES 357 PROPERTIES FIXTURES_SETUP prepare_static)
381 FIXTURES_SETUP prepare_static) 358 set_tests_properties(
382 set_tests_properties(minizip_zipping_test_file_static 359 minizip_zipping_test_file_static
383 PROPERTIES 360 PROPERTIES FIXTURES_REQUIRED prepare_static FIXTURES_SETUP
384 FIXTURES_REQUIRED prepare_static 361 zip_static)
385 FIXTURES_SETUP zip_static) 362 set_tests_properties(
386 set_tests_properties(minizip_prepare_static_unzip 363 minizip_prepare_static_unzip
387 PROPERTIES 364 PROPERTIES FIXTURES_REQUIRED zip_static FIXTURES_SETUP
388 FIXTURES_REQUIRED zip_static 365 prepare_unzip_static)
389 FIXTURES_SETUP prepare_unzip_static) 366 set_tests_properties(
390 set_tests_properties(minizip_miniunzipping_test_file_static.zip 367 minizip_miniunzipping_test_file_static.zip
391 PROPERTIES 368 PROPERTIES FIXTURES_REQUIRED prepare_unzip_static FIXTURES_SETUP
392 FIXTURES_REQUIRED prepare_unzip_static 369 prepare_compare_static)
393 FIXTURES_SETUP prepare_compare_static) 370 set_tests_properties(
394 set_tests_properties(minizip_compare_static 371 minizip_compare_static
395 PROPERTIES 372 PROPERTIES FIXTURES_REQUIRED prepare_compare_static FIXTURES_SETUP
396 FIXTURES_REQUIRED prepare_compare_static 373 compared_static)
397 FIXTURES_SETUP compared_static)
398 set_tests_properties(minizip_clean_static_zip 374 set_tests_properties(minizip_clean_static_zip
399 PROPERTIES 375 PROPERTIES FIXTURES_CLEANUP compared_static)
400 FIXTURES_CLEANUP compared_static)
401 endif(MINIZIP_BUILD_STATIC) 376 endif(MINIZIP_BUILD_STATIC)
402 377
403 add_subdirectory(test) 378 add_subdirectory(test)
diff --git a/contrib/minizip/minizipConfig.cmake.in b/contrib/minizip/minizipConfig.cmake.in
index 14db08d..5456053 100644
--- a/contrib/minizip/minizipConfig.cmake.in
+++ b/contrib/minizip/minizipConfig.cmake.in
@@ -15,7 +15,7 @@ if(minizip_FIND_COMPONENTS)
15 find_dependency(ZLIB CONFIG COMPONENTS ${minizip_FIND_COMPONENTS}) 15 find_dependency(ZLIB CONFIG COMPONENTS ${minizip_FIND_COMPONENTS})
16 16
17 foreach(_comp ${minizip_FIND_COMPONENTS}) 17 foreach(_comp ${minizip_FIND_COMPONENTS})
18 if (NOT _comp IN_LIST _MINIZIP_supported_components) 18 if(NOT _comp IN_LIST _MINIZIP_supported_components)
19 set(minizip_FOUND False) 19 set(minizip_FOUND False)
20 set(minizip_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}") 20 set(minizip_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
21 endif(NOT _comp IN_LIST _MINIZIP_supported_components) 21 endif(NOT _comp IN_LIST _MINIZIP_supported_components)
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index 2da5ae1..2f86ee3 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -1,4 +1,4 @@
1#if we are built from with zlib, use this path's) 1# if we are built from with zlib, use this path's)
2if(DEFINED ZLIB_BUILD_SHARED) 2if(DEFINED ZLIB_BUILD_SHARED)
3 set(WORK_DIR ${zlib_BINARY_DIR}) 3 set(WORK_DIR ${zlib_BINARY_DIR})
4 set(inst_setup minizip_minizip_install) 4 set(inst_setup minizip_minizip_install)
@@ -7,31 +7,30 @@ else(DEFINED ZLIB_BUILD_SHARED)
7 set(inst_setup minizip_minizip_install) 7 set(inst_setup minizip_minizip_install)
8 set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}") 8 set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
9 9
10 add_test(NAME minizip_install 10 add_test(
11 COMMAND ${CMAKE_COMMAND} --install ${minizip_BINARY_DIR} 11 NAME minizip_install
12 --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install 12 COMMAND ${CMAKE_COMMAND} --install ${minizip_BINARY_DIR} --prefix
13 --config $<CONFIG> 13 ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG>
14 WORKING_DIRECTORY ${minizip_BINARY_DIR}) 14 WORKING_DIRECTORY ${minizip_BINARY_DIR})
15 15
16 set_tests_properties(minizip_install 16 set_tests_properties(minizip_install PROPERTIES FIXTURES_SETUP
17 PROPERTIES 17 minizip_install)
18 FIXTURES_SETUP minizip_install)
19endif(DEFINED ZLIB_BUILD_SHARED) 18endif(DEFINED ZLIB_BUILD_SHARED)
20 19
21file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 20file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
22file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) 21file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
23file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) 22file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
24 23
25configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in 24configure_file(
26 ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt 25 ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
27 @ONLY) 26 ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
28 27
29configure_file( 28configure_file(
30 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in 29 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
31 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt 30 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY)
32 @ONLY)
33 31
34configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in 32configure_file(
33 ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
35 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt 34 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
36 @ONLY) 35 @ONLY)
37 36
@@ -45,83 +44,78 @@ endif(GENERATOR)
45# 44#
46# findpackage_test 45# findpackage_test
47# 46#
48add_test(NAME minizip_find_package_configure 47add_test(
49 COMMAND ${CMAKE_COMMAND} 48 NAME minizip_find_package_configure
50 ${PLATFORM} 49 COMMAND
50 ${CMAKE_COMMAND} ${PLATFORM}
51 -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build 51 -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
52 -DCMAKE_BUILD_TYPE=$<CONFIG> 52 -DCMAKE_BUILD_TYPE=$<CONFIG> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
53 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
54 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 53 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
55 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install 54 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG}
56 ${ZLIB_ARG} 55 --fresh -G "${CMAKE_GENERATOR}"
57 --fresh
58 -G "${CMAKE_GENERATOR}"
59 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) 56 -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
60 57
61add_test(NAME minizip_find_package_build 58add_test(
62 COMMAND ${CMAKE_COMMAND} --build . 59 NAME minizip_find_package_build
63 --config $<CONFIG> 60 COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
64 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) 61 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
65 62
66set_tests_properties(minizip_find_package_configure PROPERTIES 63set_tests_properties(
67 FIXTURES_REQUIRED ${inst_setup} 64 minizip_find_package_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup}
68 FIXTURES_SETUP mzfp_config) 65 FIXTURES_SETUP mzfp_config)
69 66
70set_tests_properties(minizip_find_package_build PROPERTIES 67set_tests_properties(minizip_find_package_build PROPERTIES FIXTURES_REQUIRED
71 FIXTURES_REQUIRED mzfp_config) 68 mzfp_config)
72 69
73# 70#
74# add_subdirectory_test 71# add_subdirectory_test
75# 72#
76add_test(NAME minizip_add_subdirectory_configure 73add_test(
77 COMMAND ${CMAKE_COMMAND} 74 NAME minizip_add_subdirectory_configure
78 ${PLATFORM} 75 COMMAND
79 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build 76 ${CMAKE_COMMAND} ${PLATFORM}
80 -DCMAKE_BUILD_TYPE=$<CONFIG> 77 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
81 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 78 -DCMAKE_BUILD_TYPE=$<CONFIG> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
82 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 79 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
83 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install 80 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG}
84 ${ZLIB_ARG} 81 --fresh -G "${CMAKE_GENERATOR}"
85 --fresh 82 -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
86 -G "${CMAKE_GENERATOR}" 83
87 -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) 84add_test(
88 85 NAME minizip_add_subdirectory_build
89add_test(NAME minizip_add_subdirectory_build 86 COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
90 COMMAND ${CMAKE_COMMAND} --build .
91 --config $<CONFIG>
92 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) 87 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
93 88
94set_tests_properties(minizip_add_subdirectory_configure PROPERTIES 89set_tests_properties(
95 FIXTURES_REQUIRED ${inst_setup} 90 minizip_add_subdirectory_configure
96 FIXTURES_SETUP mzas_config) 91 PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP mzas_config)
97 92
98set_tests_properties(minizip_add_subdirectory_build PROPERTIES 93set_tests_properties(minizip_add_subdirectory_build PROPERTIES FIXTURES_REQUIRED
99 FIXTURES_REQUIRED mzas_config) 94 mzas_config)
100 95
101# 96#
102# add_subdirectory_exclude_test 97# add_subdirectory_exclude_test
103# 98#
104add_test(NAME minizip_add_subdirectory_exclude_configure 99add_test(
105 COMMAND ${CMAKE_COMMAND} 100 NAME minizip_add_subdirectory_exclude_configure
106 ${PLATFORM} 101 COMMAND
107 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build 102 ${CMAKE_COMMAND} ${PLATFORM}
108 -DCMAKE_BUILD_TYPE=$<CONFIG> 103 -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
109 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} 104 -DCMAKE_BUILD_TYPE=$<CONFIG> -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
110 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} 105 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
111 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install 106 -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG}
112 ${ZLIB_ARG} 107 --fresh -G "${CMAKE_GENERATOR}"
113 --fresh 108 -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
114 -G "${CMAKE_GENERATOR}" 109
115 -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) 110add_test(
116 111 NAME minizip_add_subdirectory_exclude_build
117add_test(NAME minizip_add_subdirectory_exclude_build 112 COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
118 COMMAND ${CMAKE_COMMAND} --build . 113 WORKING_DIRECTORY
119 --config $<CONFIG> 114 ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
120 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) 115
121 116set_tests_properties(
122set_tests_properties(minizip_add_subdirectory_exclude_configure PROPERTIES 117 minizip_add_subdirectory_exclude_configure
123 FIXTURES_REQUIRED ${inst_setup} 118 PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP mzasx_config)
124 FIXTURES_SETUP mzasx_config) 119
125 120set_tests_properties(minizip_add_subdirectory_exclude_build
126set_tests_properties(minizip_add_subdirectory_exclude_build PROPERTIES 121 PROPERTIES FIXTURES_REQUIRED mzasx_config)
127 FIXTURES_REQUIRED mzasx_config)
diff --git a/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in b/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
index f662cda..8ac16b5 100644
--- a/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
+++ b/contrib/minizip/test/add_subdirectory_exclude_test.cmake.in
@@ -1,6 +1,7 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(minizip_add_subdirectory_exclude_from_all 3project(
4 minizip_add_subdirectory_exclude_from_all
4 LANGUAGES C 5 LANGUAGES C
5 VERSION @minizip_VERSION@) 6 VERSION @minizip_VERSION@)
6 7
@@ -9,13 +10,13 @@ option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@)
9option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@) 10option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@)
10option(MINIZIP_ENABLE_BZIP2 "" @MINIZIP_ENABLE_BZIP2@) 11option(MINIZIP_ENABLE_BZIP2 "" @MINIZIP_ENABLE_BZIP2@)
11 12
12add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip EXCLUDE_FROM_ALL) 13add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip
14 EXCLUDE_FROM_ALL)
13 15
14set(MINIZIP_SRCS 16set(MINIZIP_SRCS
15 @minizip_SOURCE_DIR@/ioapi.c 17 @minizip_SOURCE_DIR@/ioapi.c
16 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c> 18 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c>
17 @minizip_SOURCE_DIR@/minizip.c 19 @minizip_SOURCE_DIR@/minizip.c @minizip_SOURCE_DIR@/zip.c)
18 @minizip_SOURCE_DIR@/zip.c)
19 20
20if(MINIZIP_BUILD_SHARED) 21if(MINIZIP_BUILD_SHARED)
21 add_executable(test_example ${MINIZIP_SRCS}) 22 add_executable(test_example ${MINIZIP_SRCS})
diff --git a/contrib/minizip/test/add_subdirectory_test.cmake.in b/contrib/minizip/test/add_subdirectory_test.cmake.in
index be5c664..9d068fb 100644
--- a/contrib/minizip/test/add_subdirectory_test.cmake.in
+++ b/contrib/minizip/test/add_subdirectory_test.cmake.in
@@ -1,6 +1,7 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(minizip_add_subdirectory_exclude_from_all 3project(
4 minizip_add_subdirectory_exclude_from_all
4 LANGUAGES C 5 LANGUAGES C
5 VERSION @minizip_VERSION@) 6 VERSION @minizip_VERSION@)
6 7
@@ -14,8 +15,7 @@ add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip)
14set(MINIZIP_SRCS 15set(MINIZIP_SRCS
15 @minizip_SOURCE_DIR@/ioapi.c 16 @minizip_SOURCE_DIR@/ioapi.c
16 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c> 17 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c>
17 @minizip_SOURCE_DIR@/minizip.c 18 @minizip_SOURCE_DIR@/minizip.c @minizip_SOURCE_DIR@/zip.c)
18 @minizip_SOURCE_DIR@/zip.c)
19 19
20if(MINIZIP_BUILD_SHARED) 20if(MINIZIP_BUILD_SHARED)
21 add_executable(test_example ${MINIZIP_SRCS}) 21 add_executable(test_example ${MINIZIP_SRCS})
diff --git a/contrib/minizip/test/find_package_test.cmake.in b/contrib/minizip/test/find_package_test.cmake.in
index b56b559..a2c5fb0 100644
--- a/contrib/minizip/test/find_package_test.cmake.in
+++ b/contrib/minizip/test/find_package_test.cmake.in
@@ -1,6 +1,7 @@
1cmake_minimum_required(VERSION 3.12) 1cmake_minimum_required(VERSION 3.12)
2 2
3project(minizip_find_package 3project(
4 minizip_find_package
4 LANGUAGES C 5 LANGUAGES C
5 VERSION @minizip_VERSION@) 6 VERSION @minizip_VERSION@)
6 7
@@ -11,8 +12,7 @@ find_package(minizip ${minizip_VERSION} CONFIG REQUIRED)
11set(MINIZIP_SRCS 12set(MINIZIP_SRCS
12 @minizip_SOURCE_DIR@/ioapi.c 13 @minizip_SOURCE_DIR@/ioapi.c
13 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c> 14 $<$<BOOL:${WIN32}>:@minizip_SOURCE_DIR@/iowin32.c>
14 @minizip_SOURCE_DIR@/minizip.c 15 @minizip_SOURCE_DIR@/minizip.c @minizip_SOURCE_DIR@/zip.c)
15 @minizip_SOURCE_DIR@/zip.c)
16 16
17if(MINIZIP_BUILD_SHARED) 17if(MINIZIP_BUILD_SHARED)
18 add_executable(test_example ${MINIZIP_SRCS}) 18 add_executable(test_example ${MINIZIP_SRCS})
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 19:52:44 +0000