From 8b8a124eb42b027dceab01c7d4942a18c756d28e Mon Sep 17 00:00:00 2001 From: Vollstrecker Date: Fri, 3 Jan 2025 09:50:16 +0100 Subject: CMake: Add cmake-format.yaml and reformat the cmake files. --- contrib/minizip/CMakeLists.txt | 391 ++++++++++----------- contrib/minizip/minizipConfig.cmake.in | 2 +- contrib/minizip/test/CMakeLists.txt | 146 ++++---- .../test/add_subdirectory_exclude_test.cmake.in | 9 +- .../minizip/test/add_subdirectory_test.cmake.in | 6 +- contrib/minizip/test/find_package_test.cmake.in | 6 +- 6 files changed, 265 insertions(+), 295 deletions(-) (limited to 'contrib') 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 @@ cmake_minimum_required(VERSION 3.12) -project(minizip +project( + minizip VERSION 1.0.0 LANGUAGES C DESCRIPTION "A library for creating zipfiles based in zlib" @@ -11,17 +12,17 @@ if(CMAKE_SIZEOF_VOID_P LESS 8 AND NOT MINGW) return() endif(CMAKE_SIZEOF_VOID_P LESS 8 AND NOT MINGW) -#============================================================================ +# ============================================================================ # CPack -#============================================================================ +# ============================================================================ set(CPACK_PACKAGE_VENDOR "zlib-Project") set(CPACK_PACKAGE_DESCRIPTION_FILE ${minizip_SOURCE_DIR}/MiniZip64_info.txt) set(CPACK_RESOURCE_FILE_LICENSE ${minizip_SOURCE_DIR}/../../LICENSE) set(CPACK_RESOURCE_FILE_README ${minizip_SOURCE_DIR}/MiniZip64_info.txt) -#============================================================================ +# ============================================================================ # configuration -#============================================================================ +# ============================================================================ option(MINIZIP_BUILD_SHARED "Enable building minizip shared library" ON) option(MINIZIP_BUILD_STATIC "Enable building minizip static library" ON) option(MINIZIP_BUILD_TESTING "Enable testing of minizip" ON) @@ -92,40 +93,17 @@ if(NOT TARGET ZLIB::ZLIB) find_package(ZLIB REQUIRED CONFIG) endif(NOT TARGET ZLIB::ZLIB) -set(LIBMINIZIP_SRCS - ioapi.c - mztools.c - unzip.c - zip.c) +set(LIBMINIZIP_SRCS ioapi.c mztools.c unzip.c zip.c) -set(LIBMINIZIP_HDRS - crypt.h - ints.h - ioapi.h - mztools.h - unzip.h - zip.h) +set(LIBMINIZIP_HDRS crypt.h ints.h ioapi.h mztools.h unzip.h zip.h) -set(MINIZIP_SRCS - ioapi.c - $<$:iowin32.c> - minizip.c - zip.c) +set(MINIZIP_SRCS ioapi.c $<$:iowin32.c> minizip.c zip.c) -set(MINIZIP_HDRS - crypt.h - ints.h - ioapi.h - $<$:iowin32.h> - skipset.h - zip.h) +set(MINIZIP_HDRS crypt.h ints.h ioapi.h $<$:iowin32.h> skipset.h + zip.h) -set(MINIUNZIP_SRCS - ioapi.c - $<$:iowin32.c> - miniunz.c - unzip.c - zip.c) +set(MINIUNZIP_SRCS ioapi.c $<$:iowin32.c> miniunz.c unzip.c + zip.c) set(MINIUNZIP_HDRS crypt.h @@ -143,261 +121,258 @@ endif(WIN32) if(MINIZIP_BUILD_SHARED) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) - add_library(libminizip SHARED - ${LIBMINIZIP_SRCS} - ${LIBMINIZIP_HDRS}) + add_library(libminizip SHARED ${LIBMINIZIP_SRCS} ${LIBMINIZIP_HDRS}) add_library(MINIZIP::minizip ALIAS libminizip) - target_include_directories(libminizip PUBLIC - $ - $) - target_compile_definitions(libminizip - PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> - $<$:HAVE_BZIP2=1> - $<$:HAVE_HIDDEN> - $<$:HAVE_UNISTD_H=1> - $<$:USE_FILE32API=1> - PUBLIC - $<$:_LARGEFILE64_SOURCE=1>) + target_include_directories( + libminizip PUBLIC $ + $) + target_compile_definitions( + libminizip + PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> + $<$:HAVE_BZIP2=1> + $<$:HAVE_HIDDEN> + $<$:HAVE_UNISTD_H=1> + $<$:USE_FILE32API=1> + PUBLIC $<$:_LARGEFILE64_SOURCE=1>) if(NOT CYGWIN) - set_target_properties(libminizip PROPERTIES - SOVERSION ${minizip_VERSION_MAJOR}) + set_target_properties(libminizip PROPERTIES SOVERSION + ${minizip_VERSION_MAJOR}) endif(NOT CYGWIN) - set_target_properties(libminizip PROPERTIES - EXPORT_NAME minizip - OUTPUT_NAME minizip - VERSIOM ${minizip_VERSION} - SOVERSION ${minizip_VERSION_MAJOR}) + set_target_properties( + libminizip + PROPERTIES EXPORT_NAME minizip + OUTPUT_NAME minizip + VERSIOM ${minizip_VERSION} + SOVERSION ${minizip_VERSION_MAJOR}) target_link_libraries(libminizip PUBLIC ZLIB::ZLIB) - add_executable(minizip - ${MINIZIP_SRCS} - ${MINIZIP_HDRS}) - set_target_properties(minizip PROPERTIES - EXPORT_NAME minizip_executable) - target_compile_definitions(minizip - PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> - $<$:USE_FILE32API=1>) + add_executable(minizip ${MINIZIP_SRCS} ${MINIZIP_HDRS}) + set_target_properties(minizip PROPERTIES EXPORT_NAME minizip_executable) + target_compile_definitions( + minizip PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> + $<$:USE_FILE32API=1>) target_link_libraries(minizip PRIVATE MINIZIP::minizip) - add_executable(miniunzip - ${MINIUNZIP_SRCS} - ${MINIUNZIP_HDRS}) - set_target_properties(miniunzip PROPERTIES - EXPORT_NAME miniunzip_executable) - target_compile_definitions(miniunzip - PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> - $<$:USE_FILE32API=1>) + add_executable(miniunzip ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS}) + set_target_properties(miniunzip PROPERTIES EXPORT_NAME miniunzip_executable) + target_compile_definitions( + miniunzip PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> + $<$:USE_FILE32API=1>) target_link_libraries(miniunzip PRIVATE MINIZIP::minizip) endif(MINIZIP_BUILD_SHARED) if(MINIZIP_BUILD_STATIC) - add_library(libminizipstatic STATIC - ${LIBMINIZIP_SRCS} - ${LIBMINIZIP_HDRS}) + add_library(libminizipstatic STATIC ${LIBMINIZIP_SRCS} ${LIBMINIZIP_HDRS}) add_library(MINIZIP::minizipstatic ALIAS libminizipstatic) - target_include_directories(libminizipstatic PUBLIC - $ - $) - target_compile_definitions(libminizipstatic - PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> - $<$:HAVE_BZIP2=1> - $<$:HAVE_HIDDEN> - $<$:HAVE_UNISTD_H=1> - $<$:USE_FILE32API=1> - PUBLIC - $<$:_LARGEFILE64_SOURCE=1>) - set_target_properties(libminizipstatic PROPERTIES - EXPORT_NAME minizipstatic - OUTPUT_NAME minizip${minizip_static_suffix}) + target_include_directories( + libminizipstatic + PUBLIC $ + $) + target_compile_definitions( + libminizipstatic + PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> + $<$:HAVE_BZIP2=1> + $<$:HAVE_HIDDEN> + $<$:HAVE_UNISTD_H=1> + $<$:USE_FILE32API=1> + PUBLIC $<$:_LARGEFILE64_SOURCE=1>) + set_target_properties( + libminizipstatic PROPERTIES EXPORT_NAME minizipstatic + OUTPUT_NAME minizip${minizip_static_suffix}) if(CYGWIN) - set_target_properties(libminizipstatic PROPERTIES - SUFFIX ".dll.a") + set_target_properties(libminizipstatic PROPERTIES SUFFIX ".dll.a") endif(CYGWIN) target_link_libraries(libminizipstatic PUBLIC ZLIB::ZLIBSTATIC) - add_executable(minizipstatic - ${MINIZIP_SRCS} - ${MINIZIP_HDRS}) - set_target_properties(minizipstatic PROPERTIES - EXPORT_NAME minizip_static_executable) - target_compile_definitions(minizipstatic - PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> - $<$:USE_FILE32API=1>) + add_executable(minizipstatic ${MINIZIP_SRCS} ${MINIZIP_HDRS}) + set_target_properties(minizipstatic PROPERTIES EXPORT_NAME + minizip_static_executable) + target_compile_definitions( + minizipstatic PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> + $<$:USE_FILE32API=1>) target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic) - add_executable(miniunzipstatic - ${MINIUNZIP_SRCS} - ${MINIUNZIP_HDRS}) - set_target_properties(miniunzipstatic PROPERTIES - EXPORT_NAME miniunzip_static_executable) - target_compile_definitions(miniunzipstatic - PRIVATE - $<$:_CRT_SECURE_NO_WARNINGS> - $<$:USE_FILE32API=1>) + add_executable(miniunzipstatic ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS}) + set_target_properties(miniunzipstatic + PROPERTIES EXPORT_NAME miniunzip_static_executable) + target_compile_definitions( + miniunzipstatic PRIVATE $<$:_CRT_SECURE_NO_WARNINGS> + $<$:USE_FILE32API=1>) target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic) endif(MINIZIP_BUILD_STATIC) if(MINIZIP_INSTALL) if(MINIZIP_BUILD_SHARED) - install(TARGETS libminizip minizip miniunzip + install( + TARGETS libminizip minizip miniunzip COMPONENT Runtime EXPORT minizipSharedExport RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install(EXPORT minizipSharedExport - FILE minizip-shared.cmake - NAMESPACE MINIZIP:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) + install( + EXPORT minizipSharedExport + FILE minizip-shared.cmake + NAMESPACE MINIZIP:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) if(MINIZIP_INSTALL_COMPAT_DLL) - install(FILES $ + install( + FILES $ COMPONENT Runtime RENAME libminizip-${minizip_VERSION_MAJOR}.dll DESTINATION "${CMAKE_INSTALL_BINDIR}") endif(MINIZIP_INSTALL_COMPAT_DLL) if(MSVC) - install(FILES $ + install( + FILES $ COMPONENT Runtime DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug OR RelWithDebInfo - OPTIONAL - ) + OPTIONAL) endif(MSVC) endif(MINIZIP_BUILD_SHARED) if(MINIZIP_BUILD_STATIC) - install(TARGETS libminizipstatic - COMPONENT Development - TARGETS minizipstatic miniunzipstatic - COMPONENT Runtime + install( + TARGETS libminizipstatic + COMPONENT Development + TARGETS minizipstatic miniunzipstatic + COMPONENT Runtime EXPORT minizipStaticExport RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install(EXPORT minizipStaticExport - FILE minizip-static.cmake - NAMESPACE MINIZIP:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) + install( + EXPORT minizipStaticExport + FILE minizip-static.cmake + NAMESPACE MINIZIP:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) endif(MINIZIP_BUILD_STATIC) - configure_package_config_file(${minizip_SOURCE_DIR}/minizipConfig.cmake.in + configure_package_config_file( + ${minizip_SOURCE_DIR}/minizipConfig.cmake.in ${minizip_BINARY_DIR}/minizipConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) write_basic_package_version_file( "${minizip_BINARY_DIR}/minizipConfigVersion.cmake" VERSION "${minizip_VERSION}" COMPATIBILITY AnyNewerVersion) - install(FILES - ${minizip_BINARY_DIR}/minizipConfig.cmake - ${minizip_BINARY_DIR}/minizipConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) - install(FILES ${LIBMINIZIP_HDRS} - COMPONENT Development - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + install(FILES ${minizip_BINARY_DIR}/minizipConfig.cmake + ${minizip_BINARY_DIR}/minizipConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) + install( + FILES ${LIBMINIZIP_HDRS} + COMPONENT Development + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") endif(MINIZIP_INSTALL) if(MINIZIP_BUILD_TESTING) enable_testing() - if(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") - add_test(NAME minizip_prepare_shared_zip - COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm + if(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL + ".dll") + add_test( + NAME minizip_prepare_shared_zip + COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON -P + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_zipping_test_file_shared + add_test( + NAME minizip_zipping_test_file_shared COMMAND minizip test_file_shared.zip test_file_shared.txt WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_prepare_shared_unzip - COMMAND ${CMAKE_COMMAND} -DMOVE_SHARED=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm + add_test( + NAME minizip_prepare_shared_unzip + COMMAND ${CMAKE_COMMAND} -DMOVE_SHARED=ON -P + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_miniunzipping_test_file_shared.zip + add_test( + NAME minizip_miniunzipping_test_file_shared.zip COMMAND miniunzip test_file_shared.zip WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_compare_shared - COMMAND ${CMAKE_COMMAND} -E compare_files - test_file_shared.txt test_file_shared.orig + add_test( + NAME minizip_compare_shared + COMMAND ${CMAKE_COMMAND} -E compare_files test_file_shared.txt + test_file_shared.orig WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_clean_shared_zip - COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm + add_test( + NAME minizip_clean_shared_zip + COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON -P + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) set_tests_properties(minizip_prepare_shared_zip - PROPERTIES - FIXTURES_SETUP prepare_shared) - set_tests_properties(minizip_zipping_test_file_shared - PROPERTIES - FIXTURES_REQUIRED prepare_shared - FIXTURES_SETUP zip_shared) - set_tests_properties(minizip_prepare_shared_unzip - PROPERTIES - FIXTURES_REQUIRED zip_shared - FIXTURES_SETUP prepare_unzip_shared) - set_tests_properties(minizip_miniunzipping_test_file_shared.zip - PROPERTIES - FIXTURES_REQUIRED prepare_unzip_shared - FIXTURES_SETUP prepare_compare_shared) - set_tests_properties(minizip_compare_shared - PROPERTIES - FIXTURES_REQUIRED prepare_compare_shared - FIXTURES_SETUP compared_shared) + PROPERTIES FIXTURES_SETUP prepare_shared) + set_tests_properties( + minizip_zipping_test_file_shared + PROPERTIES FIXTURES_REQUIRED prepare_shared FIXTURES_SETUP + zip_shared) + set_tests_properties( + minizip_prepare_shared_unzip + PROPERTIES FIXTURES_REQUIRED zip_shared FIXTURES_SETUP + prepare_unzip_shared) + set_tests_properties( + minizip_miniunzipping_test_file_shared.zip + PROPERTIES FIXTURES_REQUIRED prepare_unzip_shared FIXTURES_SETUP + prepare_compare_shared) + set_tests_properties( + minizip_compare_shared + PROPERTIES FIXTURES_REQUIRED prepare_compare_shared FIXTURES_SETUP + compared_shared) set_tests_properties(minizip_clean_shared_zip - PROPERTIES - FIXTURES_CLEANUP compared_shared) - endif(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll") + PROPERTIES FIXTURES_CLEANUP compared_shared) + endif(MINIZIP_BUILD_SHARED AND NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL + ".dll") if(MINIZIP_BUILD_STATIC) - add_test(NAME minizip_prepare_static_zip - COMMAND ${CMAKE_COMMAND} -DCREATE_STATIC=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm + add_test( + NAME minizip_prepare_static_zip + COMMAND ${CMAKE_COMMAND} -DCREATE_STATIC=ON -P + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_zipping_test_file_static + add_test( + NAME minizip_zipping_test_file_static COMMAND minizipstatic test_file_static.zip test_file_static.txt WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_prepare_static_unzip - COMMAND ${CMAKE_COMMAND} -DMOVE_STATIC=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm + add_test( + NAME minizip_prepare_static_unzip + COMMAND ${CMAKE_COMMAND} -DMOVE_STATIC=ON -P + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_miniunzipping_test_file_static.zip + add_test( + NAME minizip_miniunzipping_test_file_static.zip COMMAND miniunzipstatic test_file_static.zip WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_compare_static - COMMAND ${CMAKE_COMMAND} -E compare_files - test_file_static.txt test_file_static.orig + add_test( + NAME minizip_compare_static + COMMAND ${CMAKE_COMMAND} -E compare_files test_file_static.txt + test_file_static.orig WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) - add_test(NAME minizip_clean_static_zip - COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm + add_test( + NAME minizip_clean_static_zip + COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON -P + ${CMAKE_CURRENT_SOURCE_DIR}/test/test_helper.cm WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test) set_tests_properties(minizip_prepare_static_zip - PROPERTIES - FIXTURES_SETUP prepare_static) - set_tests_properties(minizip_zipping_test_file_static - PROPERTIES - FIXTURES_REQUIRED prepare_static - FIXTURES_SETUP zip_static) - set_tests_properties(minizip_prepare_static_unzip - PROPERTIES - FIXTURES_REQUIRED zip_static - FIXTURES_SETUP prepare_unzip_static) - set_tests_properties(minizip_miniunzipping_test_file_static.zip - PROPERTIES - FIXTURES_REQUIRED prepare_unzip_static - FIXTURES_SETUP prepare_compare_static) - set_tests_properties(minizip_compare_static - PROPERTIES - FIXTURES_REQUIRED prepare_compare_static - FIXTURES_SETUP compared_static) + PROPERTIES FIXTURES_SETUP prepare_static) + set_tests_properties( + minizip_zipping_test_file_static + PROPERTIES FIXTURES_REQUIRED prepare_static FIXTURES_SETUP + zip_static) + set_tests_properties( + minizip_prepare_static_unzip + PROPERTIES FIXTURES_REQUIRED zip_static FIXTURES_SETUP + prepare_unzip_static) + set_tests_properties( + minizip_miniunzipping_test_file_static.zip + PROPERTIES FIXTURES_REQUIRED prepare_unzip_static FIXTURES_SETUP + prepare_compare_static) + set_tests_properties( + minizip_compare_static + PROPERTIES FIXTURES_REQUIRED prepare_compare_static FIXTURES_SETUP + compared_static) set_tests_properties(minizip_clean_static_zip - PROPERTIES - FIXTURES_CLEANUP compared_static) + PROPERTIES FIXTURES_CLEANUP compared_static) endif(MINIZIP_BUILD_STATIC) 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) find_dependency(ZLIB CONFIG COMPONENTS ${minizip_FIND_COMPONENTS}) foreach(_comp ${minizip_FIND_COMPONENTS}) - if (NOT _comp IN_LIST _MINIZIP_supported_components) + if(NOT _comp IN_LIST _MINIZIP_supported_components) set(minizip_FOUND False) set(minizip_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}") 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 @@ -#if we are built from with zlib, use this path's) +# if we are built from with zlib, use this path's) if(DEFINED ZLIB_BUILD_SHARED) set(WORK_DIR ${zlib_BINARY_DIR}) set(inst_setup minizip_minizip_install) @@ -7,31 +7,30 @@ else(DEFINED ZLIB_BUILD_SHARED) set(inst_setup minizip_minizip_install) set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}") - add_test(NAME minizip_install - COMMAND ${CMAKE_COMMAND} --install ${minizip_BINARY_DIR} - --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install - --config $ + add_test( + NAME minizip_install + COMMAND ${CMAKE_COMMAND} --install ${minizip_BINARY_DIR} --prefix + ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $ WORKING_DIRECTORY ${minizip_BINARY_DIR}) - set_tests_properties(minizip_install - PROPERTIES - FIXTURES_SETUP minizip_install) + set_tests_properties(minizip_install PROPERTIES FIXTURES_SETUP + minizip_install) endif(DEFINED ZLIB_BUILD_SHARED) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt - @ONLY) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt - @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt @ONLY) @@ -45,83 +44,78 @@ endif(GENERATOR) # # findpackage_test # -add_test(NAME minizip_find_package_configure - COMMAND ${CMAKE_COMMAND} - ${PLATFORM} +add_test( + NAME minizip_find_package_configure + COMMAND + ${CMAKE_COMMAND} ${PLATFORM} -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build - -DCMAKE_BUILD_TYPE=$ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_BUILD_TYPE=$ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install - ${ZLIB_ARG} - --fresh - -G "${CMAKE_GENERATOR}" + -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG} + --fresh -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) -add_test(NAME minizip_find_package_build - COMMAND ${CMAKE_COMMAND} --build . - --config $ +add_test( + NAME minizip_find_package_build + COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) -set_tests_properties(minizip_find_package_configure PROPERTIES - FIXTURES_REQUIRED ${inst_setup} - FIXTURES_SETUP mzfp_config) +set_tests_properties( + minizip_find_package_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup} + FIXTURES_SETUP mzfp_config) -set_tests_properties(minizip_find_package_build PROPERTIES - FIXTURES_REQUIRED mzfp_config) +set_tests_properties(minizip_find_package_build PROPERTIES FIXTURES_REQUIRED + mzfp_config) # # add_subdirectory_test # -add_test(NAME minizip_add_subdirectory_configure - COMMAND ${CMAKE_COMMAND} - ${PLATFORM} - -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build - -DCMAKE_BUILD_TYPE=$ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install - ${ZLIB_ARG} - --fresh - -G "${CMAKE_GENERATOR}" - -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) - -add_test(NAME minizip_add_subdirectory_build - COMMAND ${CMAKE_COMMAND} --build . - --config $ +add_test( + NAME minizip_add_subdirectory_configure + COMMAND + ${CMAKE_COMMAND} ${PLATFORM} + -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build + -DCMAKE_BUILD_TYPE=$ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG} + --fresh -G "${CMAKE_GENERATOR}" + -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test) + +add_test( + NAME minizip_add_subdirectory_build + COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) -set_tests_properties(minizip_add_subdirectory_configure PROPERTIES - FIXTURES_REQUIRED ${inst_setup} - FIXTURES_SETUP mzas_config) +set_tests_properties( + minizip_add_subdirectory_configure + PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP mzas_config) -set_tests_properties(minizip_add_subdirectory_build PROPERTIES - FIXTURES_REQUIRED mzas_config) +set_tests_properties(minizip_add_subdirectory_build PROPERTIES FIXTURES_REQUIRED + mzas_config) # # add_subdirectory_exclude_test # -add_test(NAME minizip_add_subdirectory_exclude_configure - COMMAND ${CMAKE_COMMAND} - ${PLATFORM} - -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build - -DCMAKE_BUILD_TYPE=$ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install - ${ZLIB_ARG} - --fresh - -G "${CMAKE_GENERATOR}" - -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) - -add_test(NAME minizip_add_subdirectory_exclude_build - COMMAND ${CMAKE_COMMAND} --build . - --config $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) - -set_tests_properties(minizip_add_subdirectory_exclude_configure PROPERTIES - FIXTURES_REQUIRED ${inst_setup} - FIXTURES_SETUP mzasx_config) - -set_tests_properties(minizip_add_subdirectory_exclude_build PROPERTIES - FIXTURES_REQUIRED mzasx_config) +add_test( + NAME minizip_add_subdirectory_exclude_configure + COMMAND + ${CMAKE_COMMAND} ${PLATFORM} + -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build + -DCMAKE_BUILD_TYPE=$ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG} + --fresh -G "${CMAKE_GENERATOR}" + -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test) + +add_test( + NAME minizip_add_subdirectory_exclude_build + COMMAND ${CMAKE_COMMAND} --build . --config $ + WORKING_DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) + +set_tests_properties( + minizip_add_subdirectory_exclude_configure + PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP mzasx_config) + +set_tests_properties(minizip_add_subdirectory_exclude_build + PROPERTIES 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 @@ cmake_minimum_required(VERSION 3.12) -project(minizip_add_subdirectory_exclude_from_all +project( + minizip_add_subdirectory_exclude_from_all LANGUAGES C VERSION @minizip_VERSION@) @@ -9,13 +10,13 @@ option(MINIZIP_BUILD_SHARED "" @MINIZIP_BUILD_SHARED@) option(MINIZIP_BUILD_STATIC "" @MINIZIP_BUILD_STATIC@) option(MINIZIP_ENABLE_BZIP2 "" @MINIZIP_ENABLE_BZIP2@) -add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip EXCLUDE_FROM_ALL) +add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip + EXCLUDE_FROM_ALL) set(MINIZIP_SRCS @minizip_SOURCE_DIR@/ioapi.c $<$:@minizip_SOURCE_DIR@/iowin32.c> - @minizip_SOURCE_DIR@/minizip.c - @minizip_SOURCE_DIR@/zip.c) + @minizip_SOURCE_DIR@/minizip.c @minizip_SOURCE_DIR@/zip.c) if(MINIZIP_BUILD_SHARED) 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 @@ cmake_minimum_required(VERSION 3.12) -project(minizip_add_subdirectory_exclude_from_all +project( + minizip_add_subdirectory_exclude_from_all LANGUAGES C VERSION @minizip_VERSION@) @@ -14,8 +15,7 @@ add_subdirectory(@minizip_SOURCE_DIR@ ${CMAKE_CURRENT_BINARY_DIR}/minizip) set(MINIZIP_SRCS @minizip_SOURCE_DIR@/ioapi.c $<$:@minizip_SOURCE_DIR@/iowin32.c> - @minizip_SOURCE_DIR@/minizip.c - @minizip_SOURCE_DIR@/zip.c) + @minizip_SOURCE_DIR@/minizip.c @minizip_SOURCE_DIR@/zip.c) if(MINIZIP_BUILD_SHARED) 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 @@ cmake_minimum_required(VERSION 3.12) -project(minizip_find_package +project( + minizip_find_package LANGUAGES C VERSION @minizip_VERSION@) @@ -11,8 +12,7 @@ find_package(minizip ${minizip_VERSION} CONFIG REQUIRED) set(MINIZIP_SRCS @minizip_SOURCE_DIR@/ioapi.c $<$:@minizip_SOURCE_DIR@/iowin32.c> - @minizip_SOURCE_DIR@/minizip.c - @minizip_SOURCE_DIR@/zip.c) + @minizip_SOURCE_DIR@/minizip.c @minizip_SOURCE_DIR@/zip.c) if(MINIZIP_BUILD_SHARED) add_executable(test_example ${MINIZIP_SRCS}) -- cgit v1.2.3-55-g6feb