head 1.1; branch 1.1.1; access ; symbols zlib-1-3-2:1.1.1.1 ZLIB:1.1.1; locks ; strict; comment @# @; 1.1 date 2026.05.03.16.34.35; author christos; state Exp; branches 1.1.1.1; next ; commitid WC5vTA5Qzr0V6oEG; 1.1.1.1 date 2026.05.03.16.34.35; author christos; state Exp; branches ; next ; commitid WC5vTA5Qzr0V6oEG; desc @@ 1.1 log @Initial revision @ text @# if we are built from with zlib, use this path's) if(DEFINED ZLIB_BUILD_BLAST) set(WORK_DIR ${zlib_BINARY_DIR}) set(inst_setup zlib_install) else(DEFINED ZLIB_BUILD_BLAST) set(WORK_DIR ${blast_BINARY_DIR}) set(inst_setup zlib_blast_install) set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}") add_test( NAME zlib_blast_install COMMAND ${CMAKE_COMMAND} --install ${blast_BINARY_DIR} --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $ WORKING_DIRECTORY ${blast_BINARY_DIR}) set_tests_properties(zlib_blast_install PROPERTIES FIXTURES_SETUP zlib_blast_install) endif(DEFINED ZLIB_BUILD_BLAST) 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}/add_subdirectory_test.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @@ONLY) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt @@ONLY) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test/CMakeLists.txt @@ONLY) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test/CMakeLists.txt @@ONLY) # CMAKE_GENERATOR_PLATFORM doesn't work in the if set(GENERATOR ${CMAKE_GENERATOR_PLATFORM}) if(GENERATOR) set(PLATFORM "-A ${GENERATOR}") endif(GENERATOR) # # findpackage_test # add_test( NAME zlib_blast_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_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test/test_install ${ZLIB_ARG} --fresh -G "${CMAKE_GENERATOR}" -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test) add_test( NAME zlib_blast_find_package_build COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build) set_tests_properties( zlib_blast_find_package_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP blast_fp_config) set_tests_properties(zlib_blast_find_package_build PROPERTIES FIXTURES_REQUIRED blast_fp_config) # # add_subdirectory_test # add_test( NAME zlib_blast_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 zlib_blast_add_subdirectory_build COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build) set_tests_properties( zlib_blast_add_subdirectory_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP blast_as_config) set_tests_properties(zlib_blast_add_subdirectory_build PROPERTIES FIXTURES_REQUIRED blast_as_config) # # add_subdirectory_exclude_test # add_test( NAME zlib_blast_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 zlib_blast_add_subdirectory_exclude_build COMMAND ${CMAKE_COMMAND} --build . --config $ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build) set_tests_properties(zlib_blast_add_subdirectory_exclude_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup} FIXTURES_SETUP blast_asx_config) set_tests_properties(zlib_blast_add_subdirectory_exclude_build PROPERTIES FIXTURES_REQUIRED blast_asx_config) # # findpackage_no_components_test # add_test( NAME zlib_blast_find_package_no_components_configure COMMAND ${CMAKE_COMMAND} ${PLATFORM} -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_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}/findpackage_no_components_test) set_tests_properties( zlib_blast_find_package_no_components_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup}) if(NOT ZLIB_BLAST_BUILD_SHARED OR NOT ZLIB_BLAST_BUILD_STATIC) set_tests_properties(zlib_blast_find_package_no_components_configure PROPERTIES WILL_FAIL TRUE) endif(NOT ZLIB_BLAST_BUILD_SHARED OR NOT ZLIB_BLAST_BUILD_STATIC) # # findpackage_wrong_components_test # add_test( NAME zlib_blast_find_package_wrong_components_configure COMMAND ${CMAKE_COMMAND} ${PLATFORM} -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_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}/findpackage_wrong_components_test) set_tests_properties(zlib_blast_find_package_wrong_components_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup} WILL_FAIL TRUE) @ 1.1.1.1 log @import zlib-1.3.2 (previous was 1.3.1) Version 1.3.2 has these key updates from 1.3.1: Address findings of the 7ASecurity audit of zlib. Check for negative lengths in crc32_combine functions. Copy only the initialized window contents in inflateCopy. Prevent the use of insecure functions without an explicit request. Add compressBound_z and deflateBound_z functions for large values. Use atomics to build inflate fixed tables once. Add --undefined option to ./configure for UBSan checker. Copy only the initialized deflate state in deflateCopy. Zero inflate state on allocation. Add compress_z and uncompress_z functions. Complete rewrite of cmake support. Remove untgz from contrib. Vectorize the CRC-32 calculation on the s390x. Remove vstudio projects in lieu of cmake-generated projects. Add zipAlreadyThere() to minizip zip.c to help avoid duplicates. Add deflateUsed() function to get the used bits in the last byte. Fix bug in inflatePrime() for 16-bit ints. Add a "G" option to force gzip, disabling transparency in gzread(). Return all available uncompressed data on error in gzread.c. Support non-blocking devices in the gz* routines. @ text @@