Commit 9bace80 for zlib
commit 9bace80a7742699f077c4c797d03f3bc371e3765
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Fri Feb 27 14:06:51 2026 +0100
CMake: Improve formatting, long lines broken into readable chunks.
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index 35542ba..c4eac55 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -1,261 +1,196 @@
# if we are built from with zlib, use this path's)
-if (ZLIB_BLAST_INSTALL)
- if(NOT DEFINED ZLIB_BUILD_BLAST)
- set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(inst_setup blast_install)
- set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
-
- add_test(
- NAME blast_install
- COMMAND ${CMAKE_COMMAND}
- --install ${blast_BINARY_DIR}
- --prefix ${WORK_DIR}/test_install
- --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR})
-
- set_tests_properties(blast_install
- PROPERTIES
- FIXTURES_SETUP blast_install)
- endif(NOT DEFINED ZLIB_BUILD_BLAST)
-
- function(blast_findTestEnv testName)
- set(testEnv "PATH=")
-
- if(MSVC OR MINGW)
- set(separator "\\\;")
- else()
- set(separator ":")
- endif()
-
- string(APPEND testEnv "$<TARGET_FILE_DIR:BLAST::BLAST>${separator}")
- string(APPEND testEnv "$ENV{PATH}")
-
- set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
- endfunction(blast_findTestEnv testName)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${WORK_DIR}/blast_find_package_test/CMakeLists.txt @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${WORK_DIR}/blast_add_subdirectory_test/CMakeLists.txt @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${WORK_DIR}/blast_add_subdirectory_exclude_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${WORK_DIR}/blast_find_package_no_components_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
- ${WORK_DIR}/blast_find_package_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)
-
- #
- # find_package_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/blast_find_package_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/blast_find_package_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR}/blast_find_package_test_build)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_find_package_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP blast_fp_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_find_package_build
- PROPERTIES
- FIXTURES_REQUIRED blast_fp_config)
-
- #
- # add_subdirectory_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/blast_add_subdirectory_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/blast_add_subdirectory_test)
+if(NOT DEFINED ZLIB_BUILD_BLAST)
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(inst_setup zlib_blast_install)
+ set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR}/blast_add_subdirectory_test_build)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP blast_as_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_build
- PROPERTIES
- FIXTURES_REQUIRED blast_as_config)
-
- #
- # add_subdirectory_exclude_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/blast_add_subdirectory_exclude_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/blast_add_subdirectory_exclude_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY
- ${WORK_DIR}/blast_add_subdirectory_exclude_test_build)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP blast_asx_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_build
+ NAME zlib_blast_install
+ COMMAND ${CMAKE_COMMAND}
+ --install ${blast_BINARY_DIR}
+ --prefix ${WORK_DIR}/test_install
+ --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
+
+ set_tests_properties(zlib_blast_install
PROPERTIES
- FIXTURES_REQUIRED blast_asx_config)
-
- #
- # findpackage_no_components_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_no_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/blast_find_package_no_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/blast_find_package_no_components_test)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}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_CONTRIB_PREFIX}blast_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
- endif(NOT ZLIB_BLAST_BUILD_SHARED OR NOT ZLIB_BLAST_BUILD_STATIC)
-
- #
- # find_package_wrong_components_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}blast_find_package_wrong_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/blast_find_package_wrong_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/blast_find_package_wrong_components_test)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}blast_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
-endif (ZLIB_BLAST_INSTALL)
-
-if(ZLIB_BLAST_BUILD_SHARED)
- add_executable(${ZLIB_CONTRIB_PREFIX}blast_test
- ${blast_SOURCE_DIR}/blast-test.c)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_test
- PRIVATE
- ${ZLIB_CONTRIB_PREFIX}blast_blast)
-
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_test
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_test>"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_test
- PROPERTIES
- RESOURCE_LOCK blast_test_files)
-
- if(MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- blast_findtestenv(${ZLIB_CONTRIB_PREFIX}blast_test)
- endif(
- MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
-endif(ZLIB_BLAST_BUILD_SHARED)
-
-if(ZLIB_BLAST_BUILD_STATIC)
- add_executable(${ZLIB_CONTRIB_PREFIX}blast_testStatic
- ${blast_SOURCE_DIR}/blast-test.c)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}blast_testStatic
- PRIVATE ${ZLIB_CONTRIB_PREFIX}blast_blastStatic)
-
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}blast_testStatic
- COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}blast_testStatic>"
- "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_testStatic
+ FIXTURES_SETUP zlib_blast_install)
+endif(NOT DEFINED ZLIB_BUILD_BLAST)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
+ ${WORK_DIR}/blast_find_package_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
+ ${WORK_DIR}/blast_add_subdirectory_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
+ ${WORK_DIR}/blast_add_subdirectory_exclude_test/CMakeLists.txt
+ @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
+ ${WORK_DIR}/blast_find_package_no_components_test/CMakeLists.txt
+ @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
+ ${WORK_DIR}/blast_find_package_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)
+
+#
+# find_package_test
+#
+add_test(
+ NAME zlib_blast_find_package_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/blast_find_package_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_find_package_test)
+
+add_test(
+ NAME zlib_blast_find_package_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR}/blast_find_package_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${WORK_DIR}/blast_add_subdirectory_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_add_subdirectory_test)
+
+add_test(
+ NAME zlib_blast_add_subdirectory_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR}/blast_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${WORK_DIR}/blast_add_subdirectory_exclude_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_add_subdirectory_exclude_test)
+
+add_test(
+ NAME zlib_blast_add_subdirectory_exclude_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY
+ ${WORK_DIR}/blast_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${WORK_DIR}/blast_find_package_no_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_find_package_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
- RESOURCE_LOCK blast_test_files)
-endif(ZLIB_BLAST_BUILD_STATIC)
+ WILL_FAIL TRUE)
+endif(NOT ZLIB_BLAST_BUILD_SHARED OR NOT ZLIB_BLAST_BUILD_STATIC)
+
+#
+# find_package_wrong_components_test
+#
+add_test(
+ NAME zlib_blast_find_package_wrong_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/blast_find_package_wrong_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_find_package_wrong_components_test)
+
+set_tests_properties(zlib_blast_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
diff --git a/contrib/iostream3/test/CMakeLists.txt b/contrib/iostream3/test/CMakeLists.txt
index 88ba19d..c89713d 100644
--- a/contrib/iostream3/test/CMakeLists.txt
+++ b/contrib/iostream3/test/CMakeLists.txt
@@ -1,275 +1,196 @@
# if we are built from with zlib, use this path's)
-if(ZLIB_IOSTREAM3_INSTALL)
- if(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
- set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(inst_setup ${ZLIB_CONTRIB_PREFIX}iostream3_install)
- set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
+if(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(inst_setup zlib_iostream3_install)
+ set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_install
- COMMAND ${CMAKE_COMMAND}
- --install ${iostreamV3_BINARY_DIR}
- --prefix ${WORK_DIR}/test_install
- --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR})
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_install
- PROPERTIES
- FIXTURES_SETUP ${ZLIB_CONTRIB_PREFIX}iostream3_install)
- endif(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
-
- function(iostreamv3_findTestEnv testName)
- set(testEnv "PATH=")
-
- if(MSVC OR MINGW)
- set(separator "\\\;")
- else()
- set(separator ":")
- endif()
-
- string(APPEND testEnv
- "$<TARGET_FILE_DIR:${ZLIB_CONTRIB_PREFIX}iostream3_iostreamv3>${separator}")
- string(APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}")
- string(APPEND testEnv "$ENV{PATH}")
-
- set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
- endfunction(iostreamv3_findTestEnv testName)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${WORK_DIR}/iostream3_find_package_test/CMakeLists.txt @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${WORK_DIR}/iostream3_add_subdirectory_test/CMakeLists.txt @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${WORK_DIR}/iostream3_add_subdirectory_exclude_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${WORK_DIR}/iostream3_find_package_no_components_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
- ${WORK_DIR}/iostream3_find_package_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_CONTRIB_PREFIX}iostream3_find_package_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/iostream3_find_package_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/iostream3_find_package_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR}/iostream3_find_package_test_build)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_find_package_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP iostream3_fp_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_find_package_build
- PROPERTIES
- FIXTURES_REQUIRED iostream3_fp_config)
-
- #
- # add_subdirectory_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/iostream3_add_subdirectory_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/iostream3_add_subdirectory_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR}/iostream3_add_subdirectory_test_build)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP iostream3_as_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_build
- PROPERTIES
- FIXTURES_REQUIRED iostream3_as_config)
-
- #
- # add_subdirectory_exclude_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/iostream3_add_subdirectory_exclude_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/iostream3_add_subdirectory_exclude_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY
- ${WORK_DIR}/iostream3_add_subdirectory_exclude_test_build)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP iostream3_asx_config)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_build
- PROPERTIES
- FIXTURES_REQUIRED iostream3_asx_config)
-
- #
- # find_package_no_components_test
- #
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_no_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/iostream3_find_package_no_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/iostream3_find_package_no_components_test)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
-
- if(NOT ZLIB_IOSTREAM3_BUILD_SHARED OR NOT ZLIB_IOSTREAM3_BUILD_STATIC)
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
- endif(NOT ZLIB_IOSTREAM3_BUILD_SHARED OR NOT ZLIB_IOSTREAM3_BUILD_STATIC)
-
- #
- # find_package_no_components_test
- #
- add_test(
- NAME
- ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_wrong_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/iostream3_find_package_wrong_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/iostream3_find_package_wrong_components_test)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}iostream3_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
-endif(ZLIB_IOSTREAM3_INSTALL)
-
-if(ZLIB_IOSTREAM3_BUILD_SHARED)
- add_executable(${ZLIB_CONTRIB_PREFIX}iostream3_test
- ${iostreamV3_SOURCE_DIR}/test.cc
- ${iostreamV3_SOURCE_DIR}/zfstream.h)
-
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}iostream3_test
- PRIVATE IOSTREAMV3::IOSTREAMV3)
-
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}iostream3_test
- COMMAND ${ZLIB_CONTRIB_PREFIX}iostream3_test)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_test
+ NAME zlib_iostream3_install
+ COMMAND ${CMAKE_COMMAND}
+ --install ${iostreamV3_BINARY_DIR}
+ --prefix ${WORK_DIR}/test_install
+ --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
+
+ set_tests_properties(zlib_iostream3_install
PROPERTIES
- FIXTURES_SETUP iostream3_tests
- RESOURCE_LOCK iostram_txt_gz)
-
- if(MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
- iostreamv3_findtestenv(${ZLIB_CONTRIB_PREFIX}iostream3_test)
- endif(
- MSVC
- OR MSYS
- OR MINGW
- OR CYGWIN)
-endif(ZLIB_IOSTREAM3_BUILD_SHARED)
+ FIXTURES_SETUP zlib_iostream3_install)
+endif(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
+ ${WORK_DIR}/iostream3_find_package_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
+ ${WORK_DIR}/iostream3_add_subdirectory_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
+ ${WORK_DIR}/iostream3_add_subdirectory_exclude_test/CMakeLists.txt
+ @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
+ ${WORK_DIR}/iostream3_find_package_no_components_test/CMakeLists.txt
+ @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
+ ${WORK_DIR}/iostream3_find_package_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_iostream3_find_package_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/iostream3_find_package_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_find_package_test)
+
+add_test(
+ NAME zlib_iostream3_find_package_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR}/iostream3_find_package_test_build)
+
+set_tests_properties(zlib_iostream3_find_package_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP iostream3_fp_config)
-if(ZLIB_IOSTREAM3_BUILD_STATIC)
- add_executable(${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
- ${iostreamV3_SOURCE_DIR}/test.cc
- ${iostreamV3_SOURCE_DIR}/zfstream.h)
+set_tests_properties(zlib_iostream3_find_package_build
+ PROPERTIES
+ FIXTURES_REQUIRED iostream3_fp_config)
+
+#
+# add_subdirectory_test
+#
+add_test(
+ NAME zlib_iostream3_add_subdirectory_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/iostream3_add_subdirectory_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_add_subdirectory_test)
+
+add_test(
+ NAME zlib_iostream3_add_subdirectory_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR}/iostream3_add_subdirectory_test_build)
+
+set_tests_properties(zlib_iostream3_add_subdirectory_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP iostream3as_config)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
- PRIVATE IOSTREAMV3::IOSTREAMV3STATIC)
+set_tests_properties(zlib_iostream3_add_subdirectory_build
+ PROPERTIES
+ FIXTURES_REQUIRED iostream3_as_config)
+
+#
+# add_subdirectory_exclude_test
+#
+add_test(
+ NAME zlib_iostream3_add_subdirectory_exclude_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/iostream3_add_subdirectory_exclude_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_add_subdirectory_exclude_test)
+
+add_test(
+ NAME zlib_iostream3_add_subdirectory_exclude_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY
+ ${WORK_DIR}/iostream3_add_subdirectory_exclude_test_build)
+
+set_tests_properties(zlib_iostream3_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP iostream3_asx_config)
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
- COMMAND ${ZLIB_CONTRIB_PREFIX}iostream3_testStatic)
+set_tests_properties(zlib_iostream3_add_subdirectory_exclude_build
+ PROPERTIES
+ FIXTURES_REQUIRED iostream3_asx_config)
+
+#
+# find_package_no_components_test
+#
+add_test(
+ NAME zlib_iostream3_find_package_no_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/iostream3_find_package_no_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_find_package_no_components_test)
+
+set_tests_properties(zlib_iostream3_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_testStatic
+if(NOT ZLIB_IOSTREAM3_BUILD_SHARED OR NOT ZLIB_IOSTREAM3_BUILD_STATIC)
+ set_tests_properties(zlib_iostream3_find_package_no_components_configure
PROPERTIES
- FIXTURES_SETUP iostream3_tests
- RESOURCE_LOCK iostram_txt_gz)
-endif(ZLIB_IOSTREAM3_BUILD_STATIC)
-
-add_test(NAME ${ZLIB_CONTRIB_PREFIX}iostream3_cleanup
- COMMAND ${CMAKE_COMMAND} -E rm
- ${CMAKE_CURRENT_BINARY_DIR}/test1.txt.gz
- ${CMAKE_CURRENT_BINARY_DIR}/test2.txt.gz)
-
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_cleanup
+ WILL_FAIL TRUE)
+endif(NOT ZLIB_IOSTREAM3_BUILD_SHARED OR NOT ZLIB_IOSTREAM3_BUILD_STATIC)
+
+#
+# find_package_no_components_test
+#
+add_test(
+ NAME zlib_iostream3_find_package_wrong_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/iostream3_find_package_wrong_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_find_package_wrong_components_test)
+
+set_tests_properties(zlib_iostream3_find_package_wrong_components_configure
PROPERTIES
- FIXTURES_CLEANUP iostream3_tests)
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index a909a24..df864a2 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -1,329 +1,195 @@
# if we are built from with zlib, use this path's)
-if(ZLIB_MINIZIP_INSTALL)
- if(NOT DEFINED ZLIB_BUILD_MINIZIP)
- set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
- set(inst_setup minizip_install)
- set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
+if(NOT DEFINED ZLIB_BUILD_MINIZIP)
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(inst_setup minizip_install)
+ set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
- add_test(
- NAME minizip_install
- COMMAND ${CMAKE_COMMAND}
- --install ${minizip_BINARY_DIR}
- --prefix ${WORK_DIR}/test_install
- --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR})
-
- set_tests_properties(minizip_install
- PROPERTIES
- FIXTURES_SETUP minizip_install)
- endif(NOT DEFINED ZLIB_BUILD_MINIZIP)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${WORK_DIR}/minizip_find_package_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${WORK_DIR}/minizip_find_package_no_components_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
- ${WORK_DIR}/minizip_find_package_wrong_components_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${WORK_DIR}/minizip_add_subdirectory_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${WORK_DIR}/minizip_add_subdirectory_exclude_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)
-
- #
- # find_package_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/minizip_find_package_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_find_package_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR}/minizip_find_package_test_build)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP mzfp_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_build
- PROPERTIES
- FIXTURES_REQUIRED mzfp_config)
-
- #
- # find_package_no_components_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_no_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/minizip_find_package_no_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_find_package_no_components_test)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
-
- if(NOT MINIZIP_BUILD_SHARED OR NOT MINIZIP_BUILD_STATIC)
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
- endif(NOT MINIZIP_BUILD_SHARED OR NOT MINIZIP_BUILD_STATIC)
-
- #
- # find_package_no_components_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_find_package_wrong_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/minizip_find_package_wrong_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_find_package_wrong_components_test)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
-
- #
- # add_subdirectory_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/minizip_add_subdirectory_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_add_subdirectory_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${WORK_DIR}/minizip_add_subdirectory_test_build)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP mzas_config)
-
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_build
- PROPERTIES
- FIXTURES_REQUIRED mzas_config)
-
- #
- # add_subdirectory_exclude_test
- #
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${WORK_DIR}/minizip_add_subdirectory_exclude_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
- ${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_add_subdirectory_exclude_test)
-
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY
- ${WORK_DIR}/minizip_add_subdirectory_exclude_test_build)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP mzasx_config)
-
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_add_subdirectory_exclude_build
- PROPERTIES
- FIXTURES_REQUIRED mzasx_config)
-endif(ZLIB_MINIZIP_INSTALL)
-
-if(MINIZIP_BUILD_SHARED AND
- NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_shared
- COMMAND ${CMAKE_COMMAND} -DCREATE_SHARED=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
- COMMAND ${ZLIB_CONTRIB_PREFIX}minizip test_file_shared.zip test_file_shared.txt
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_shared
+ NAME minizip_install
COMMAND ${CMAKE_COMMAND}
- -DMOVE_SHARED=ON
- -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared
- COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzip test_file_shared.zip
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
- COMMAND ${CMAKE_COMMAND} -E compare_files test_file_shared.txt
- test_file_shared.orig
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_shared
- COMMAND ${CMAKE_COMMAND} -DDELETE_SHARED=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_shared
- PROPERTIES
- FIXTURES_SETUP "prepare_shared;mz_shared")
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_shared
- PROPERTIES
- FIXTURES_REQUIRED "prepare_shared;mz_shared"
- FIXTURES_SETUP zip_shared)
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_shared
- PROPERTIES
- FIXTURES_REQUIRED "zip_shared;mz_shared"
- FIXTURES_SETUP prepare_unzip_shared)
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_shared
- PROPERTIES
- FIXTURES_REQUIRED "prepare_unzip_shared;mz_shared"
- FIXTURES_SETUP prepare_compare_shared)
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_shared
- PROPERTIES
- FIXTURES_REQUIRED "prepare_compare_shared;mz_shared")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_shared
- PROPERTIES
- FIXTURES_CLEANUP mz_shared)
-endif(MINIZIP_BUILD_SHARED AND
- NOT ${CMAKE_SHARED_LIBRARY_SUFFIX} STREQUAL ".dll")
+ --install ${minizip_BINARY_DIR}
+ --prefix ${WORK_DIR}/test_install
+ --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
-if(MINIZIP_BUILD_STATIC)
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_static
- COMMAND ${CMAKE_COMMAND}
- -DCREATE_STATIC=ON
- -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
- COMMAND ${ZLIB_CONTRIB_PREFIX}minizipstatic
- test_file_static.zip
- test_file_static.txt
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_static
- COMMAND ${CMAKE_COMMAND}
- -DMOVE_STATIC=ON
- -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME
- ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static
- COMMAND ${ZLIB_CONTRIB_PREFIX}miniunzipstatic
- test_file_static.zip
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_compare_static
- COMMAND ${CMAKE_COMMAND}
- -E compare_files
- test_file_static.txt
- test_file_static.orig
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}minizip_clean_static
- COMMAND ${CMAKE_COMMAND} -DDELETE_STATIC=ON -P
- ${CMAKE_CURRENT_SOURCE_DIR}/test_helper.cm
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_prepare_zip_static
- PROPERTIES
- FIXTURES_SETUP "prepare_zip_static;mz_static")
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_zipping_test_file_static
- PROPERTIES
- FIXTURES_REQUIRED "prepare_zip_static;mz_static"
- FIXTURES_SETUP "create_zip_static")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_prepare_unzip_static
- PROPERTIES
- FIXTURES_REQUIRED "create_zip_static;mz_static"
- FIXTURES_SETUP "prepare_unzip_static")
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_miniunzipping_test_file_static
- PROPERTIES
- FIXTURES_REQUIRED "prepare_unzip_static;mz_static"
- FIXTURES_SETUP "prepare_compare_static")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_compare_static
+ set_tests_properties(minizip_install
PROPERTIES
- FIXTURES_REQUIRED "prepare_compare_static;mz_static")
- #FIXTURES_SETUP "compared_static")
- set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_clean_static
+ FIXTURES_SETUP minizip_install)
+endif(NOT DEFINED ZLIB_BUILD_MINIZIP)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
+ ${WORK_DIR}/minizip_find_package_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
+ ${WORK_DIR}/minizip_find_package_no_components_test/CMakeLists.txt
+ @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
+ ${WORK_DIR}/minizip_find_package_wrong_components_test/CMakeLists.txt
+ @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
+ ${WORK_DIR}/minizip_add_subdirectory_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
+ ${WORK_DIR}/minizip_add_subdirectory_exclude_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)
+
+#
+# find_package_test
+#
+add_test(
+ NAME minizip_find_package_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/minizip_find_package_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_find_package_test)
+
+add_test(
+ NAME minizip_find_package_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR}/minizip_find_package_test_build)
+
+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)
+
+#
+# find_package_no_components_test
+#
+add_test(
+ NAME minizip_find_package_no_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/minizip_find_package_no_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_find_package_no_components_test)
+
+set_tests_properties(minizip_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
+
+if(NOT MINIZIP_BUILD_SHARED OR NOT MINIZIP_BUILD_STATIC)
+ set_tests_properties(minizip_find_package_no_components_configure
PROPERTIES
- FIXTURES_CLEANUP mz_static)
-endif(MINIZIP_BUILD_STATIC)
+ WILL_FAIL TRUE)
+endif(NOT MINIZIP_BUILD_SHARED OR NOT MINIZIP_BUILD_STATIC)
+
+#
+# find_package_no_components_test
+#
+add_test(
+ NAME minizip_find_package_wrong_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/minizip_find_package_wrong_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_find_package_wrong_components_test)
+
+set_tests_properties(minizip_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
+
+#
+# add_subdirectory_test
+#
+add_test(
+ NAME minizip_add_subdirectory_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/minizip_add_subdirectory_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_add_subdirectory_test)
+
+add_test(
+ NAME minizip_add_subdirectory_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR}/minizip_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_build
+ PROPERTIES
+ FIXTURES_REQUIRED mzas_config)
+
+#
+# add_subdirectory_exclude_test
+#
+add_test(
+ NAME minizip_add_subdirectory_exclude_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${WORK_DIR}/minizip_add_subdirectory_exclude_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
+ ${ZLIB_ARG}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_add_subdirectory_exclude_test)
+
+add_test(
+ NAME minizip_add_subdirectory_exclude_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY
+ ${WORK_DIR}/minizip_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/puff/test/CMakeLists.txt b/contrib/puff/test/CMakeLists.txt
index 2a391ff..96a2775 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -5,90 +5,86 @@ if(NOT DEFINED ZLIB_BUILD_PUFF)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
- NAME puff_install
+ NAME zlib_puff_install
COMMAND ${CMAKE_COMMAND}
--install ${puff_BINARY_DIR}
--prefix ${WORK_DIR}/test_install
--config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR})
- set_tests_properties(puff_install
+ set_tests_properties(zlib_puff_install
PROPERTIES
- FIXTURES_SETUP puff_install)
+ FIXTURES_SETUP zlib_puff_install)
endif(NOT DEFINED ZLIB_BUILD_PUFF)
if(ZLIB_PUFF_BUILD_SHARED AND NOT WIN32)
- add_executable(${ZLIB_CONTRIB_PREFIX}puff_test
+ add_executable(zlib_puff_test
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.h)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}puff_test
- PRIVATE ${ZLIB_CONTRIB_PREFIX}puff_puff)
+ target_link_libraries(zlib_puff_test
+ PRIVATE zlib_puff_puff)
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_test
+ add_test(NAME zlib_puff_test
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_test>"
+ "$<TARGET_FILE:zlib_puff_test>"
"${puff_SOURCE_DIR}")
if(GCOV_EXECUTABLE)
- add_executable(${ZLIB_CONTRIB_PREFIX}puff_test-coverage
+ add_executable(zlib_puff_test-coverage
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.c
${puff_SOURCE_DIR}/puff.h)
- target_compile_options(${ZLIB_CONTRIB_PREFIX}puff_test-coverage
- PRIVATE
- -coverage)
+ target_compile_options(zlib_puff_test-coverage PRIVATE -coverage)
- target_link_options(${ZLIB_CONTRIB_PREFIX}puff_test-coverage
- PRIVATE
- -coverage)
+ target_link_options(zlib_puff_test-coverage PRIVATE -coverage)
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_test-coverage
+ add_test(NAME zlib_puff_test-coverage
COMMAND ${CMAKE_COMMAND}
-P
${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_test-coverage>"
+ "$<TARGET_FILE:zlib_puff_test-coverage>"
"${puff_SOURCE_DIR}"
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_bin-writer>"
+ "$<TARGET_FILE:zlib_puff_bin-writer>"
${GCOV_EXECUTABLE}
${llvm_option})
endif(GCOV_EXECUTABLE)
endif(ZLIB_PUFF_BUILD_SHARED AND NOT WIN32)
if(ZLIB_PUFF_BUILD_STATIC AND NOT WIN32)
- add_executable(${ZLIB_CONTRIB_PREFIX}puff_testStatic
+ add_executable(zlib_puff_testStatic
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.h)
- target_link_libraries(${ZLIB_CONTRIB_PREFIX}puff_testStatic
- PRIVATE ${ZLIB_CONTRIB_PREFIX}puff_puffStatic)
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_testStatic
+ target_link_libraries(zlib_puff_testStatic
+ PRIVATE zlib_puff_puffStatic)
+ add_test(NAME zlib_puff_testStatic
COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_SOURCE_DIR}/tester.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_testStatic>"
+ "$<TARGET_FILE:zlib_puff_testStatic>"
"${puff_SOURCE_DIR}")
if(GCOV_EXECUTABLE)
- add_executable(${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
+ add_executable(zlib_puff_testStatic-coverage
${puff_SOURCE_DIR}/pufftest.c
${puff_SOURCE_DIR}/puff.c
${puff_SOURCE_DIR}/puff.h)
- target_compile_options(${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
+ target_compile_options(zlib_puff_testStatic-coverage
PRIVATE -coverage)
- target_link_options(${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
+ target_link_options(zlib_puff_testStatic-coverage
PRIVATE -coverage)
- add_test(NAME ${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage
+ add_test(NAME zlib_puff_testStatic-coverage
COMMAND ${CMAKE_COMMAND}
-P
${CMAKE_CURRENT_SOURCE_DIR}/tester-cov.cmake
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_testStatic-coverage>"
+ "$<TARGET_FILE:zlib_puff_testStatic-coverage>"
"${puff_SOURCE_DIR}"
- "$<TARGET_FILE:${ZLIB_CONTRIB_PREFIX}puff_bin-writer>"
+ "$<TARGET_FILE:zlib_puff_bin-writer>"
${GCOV_EXECUTABLE}
${llvm_option})
endif(GCOV_EXECUTABLE)
@@ -128,7 +124,7 @@ endif(GENERATOR)
# find_package_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_configure
+ NAME zlib_puff_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -138,21 +134,21 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
+ --fresh
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_test)
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_build
+ NAME zlib_puff_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/puff_find_package_test_build)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_find_package_configure
+set_tests_properties(zlib_puff_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP puff_fp_config)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_find_package_build
+set_tests_properties(zlib_puff_find_package_build
PROPERTIES
FIXTURES_REQUIRED puff_fp_config)
@@ -160,7 +156,7 @@ set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_find_package_build
# add_subdirectory_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_configure
+ NAME zlib_puff_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -170,21 +166,21 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
+ --fresh
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_add_subdirectory_test)
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_build
+ NAME zlib_puff_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/puff_add_subdirectory_test_build)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_configure
+set_tests_properties(zlib_puff_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP puff_as_config)
+ FIXTURES_SETUP puiff_as_config)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_build
+set_tests_properties(zlib_puff_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED puff_as_config)
@@ -192,7 +188,7 @@ set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_configure
+ NAME zlib_puff_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -202,23 +198,22 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
+ --fresh
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_add_subdirectory_exclude_test)
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_build
+ NAME zlib_puff_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/puff_add_subdirectory_exclude_test_build)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP puff_asx_config)
+set_tests_properties(zlib_puff_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP puff_asx_config)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_build
+set_tests_properties(zlib_puff_add_subdirectory_exclude_build
PROPERTIES
FIXTURES_REQUIRED puff_asx_config)
@@ -226,7 +221,7 @@ set_tests_properties(${ZLIB_CONTRIB_PREFIX}puff_add_subdirectory_exclude_build
# find_package_no_components_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_no_components_configure
+ NAME zlib_puff_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -236,27 +231,25 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
+ --fresh
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_no_components_test)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}puff_find_package_no_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+set_tests_properties(zlib_puff_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup})
if(NOT ZLIB_PUFF_BUILD_SHARED OR NOT ZLIB_PUFF_BUILD_STATIC)
- set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}puff_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
+ set_tests_properties(zlib_puff_find_package_no_components_configure
+ PROPERTIES
+ WILL_FAIL TRUE)
endif(NOT ZLIB_PUFF_BUILD_SHARED OR NOT ZLIB_PUFF_BUILD_STATIC)
#
# find_package_no_components_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}puff_find_package_wrong_components_configure
+ NAME zlib_puff_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -266,12 +259,11 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
+ --fresh
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_wrong_components_test)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}puff_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
+set_tests_properties(zlib_puff_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
diff --git a/contrib/zlib1-dll/test/CMakeLists.txt b/contrib/zlib1-dll/test/CMakeLists.txt
index 32c013a..71c8b72 100644
--- a/contrib/zlib1-dll/test/CMakeLists.txt
+++ b/contrib/zlib1-dll/test/CMakeLists.txt
@@ -41,7 +41,7 @@ endif(GENERATOR)
# findpackage_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_configure
+ NAME zlib1-dll_find_package_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -56,16 +56,16 @@ add_test(
-S${WORK_DIR}/zlib1-dll_find_package_test)
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_build
+ NAME zlib1-dll_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/zlib1-dll_find_package_test_build)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_configure
+set_tests_properties(zlib1-dll_find_package_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP z1dll_config)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_build
+set_tests_properties(zlib1-dll_find_package_build
PROPERTIES
FIXTURES_REQUIRED z1dll_config)
@@ -73,7 +73,7 @@ set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_find_package_build
# add_subdirectory_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_configure
+ NAME zlib1-dll_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -88,16 +88,16 @@ add_test(
-S${WORK_DIR}/zlib1-dll_add_subdirectory_test)
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_build
+ NAME zlib1-dll_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY ${WORK_DIR}/zlib1-dll_add_subdirectory_test_build)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_configure
+set_tests_properties(zlib1-dll_add_subdirectory_configure
PROPERTIES
FIXTURES_REQUIRED ${inst_setup}
FIXTURES_SETUP z1dll_config)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_build
+set_tests_properties(zlib1-dll_add_subdirectory_build
PROPERTIES
FIXTURES_REQUIRED z1dll_config)
@@ -105,7 +105,7 @@ set_tests_properties(${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_build
# add_subdirectory_exclude_test
#
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_configure
+ NAME zlib1-dll_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
@@ -120,18 +120,16 @@ add_test(
-S${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test)
add_test(
- NAME ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_build
+ NAME zlib1-dll_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test_build)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP z1dllx_config)
+set_tests_properties(zlib1-dll_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ FIXTURES_SETUP z1dllx_config)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}zlib1-dll_add_subdirectory_exclude_build
- PROPERTIES
- FIXTURES_REQUIRED z1dllx_config)
+set_tests_properties(zlib1-dll_add_subdirectory_exclude_build
+ PROPERTIES
+ FIXTURES_REQUIRED z1dllx_config)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0ee0869..3d9d4c8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,13 +19,10 @@ if(ZLIB_BUILD_SHARED)
target_compile_definitions(zlib_example PRIVATE ZLIB_BUILD)
add_test(NAME zlib_example COMMAND zlib_example)
- add_executable(zlib_minigzip minigzip.c)
+ add_executable(minigzip minigzip.c)
target_compile_definitions(
- zlib_minigzip PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
- target_link_libraries(zlib_minigzip ZLIB::ZLIB)
- set_target_properties(zlib_minigzip
- PROPERTIES
- OUTPUT_NAME minigzip)
+ minigzip PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
+ target_link_libraries(minigzip ZLIB::ZLIB)
if(MSVC
OR MSYS
@@ -69,11 +66,8 @@ if(ZLIB_BUILD_STATIC)
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
add_test(NAME zlib_examplestatic COMMAND zlib_examplestatic)
- add_executable(zlib_minigzipstatic minigzip.c)
- target_link_libraries(zlib_minigzipstatic ZLIB::ZLIBSTATIC)
- set_target_properties(zlib_minigzipstatic
- PROPERTIES
- OUTPUT_NAME minigzipstatic)
+ add_executable(minigzipstatic minigzip.c)
+ target_link_libraries(minigzipstatic ZLIB::ZLIBSTATIC)
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
@@ -86,8 +80,7 @@ if(ZLIB_BUILD_STATIC)
find_program(GCOV_EXECUTABLE gcov)
endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
- if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang"
- AND NOT CMAKE_CROSSCOMPILING)
+ if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
set(llvm_names llvm_cov)
list(APPEND llvm_names llvm-cov)
@@ -97,33 +90,28 @@ if(ZLIB_BUILD_STATIC)
find_program(GCOV_EXECUTABLE NAMES ${llvm_names})
set(llvm_option "gcov")
- endif(${CMAKE_C_COMPILER_ID} STREQUAL "Clang"
- AND NOT CMAKE_CROSSCOMPILING)
-
- if (GCOV_EXECUTABLE)
- add_executable(infcover infcover.c)
- target_link_libraries(infcover ZLIB::ZLIBSTATIC)
- target_compile_options(infcover PRIVATE -coverage)
- target_link_options(infcover PRIVATE -coverage)
- target_compile_definitions(
- infcover PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
-
- add_test(NAME zlib_coverage COMMAND infcover)
- set_tests_properties(zlib_coverage PROPERTIES FIXTURES_SETUP z_cover)
- set(INFCOVER_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir)
- add_test(
- NAME zlib_coverage-summary
- COMMAND
- ${GCOV_EXECUTABLE} ${llvm_option}
- ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c -o
- ${INFCOVER_DIR}/infcover.c.gcda)
+ endif(${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
+
+ add_executable(infcover infcover.c)
+ target_link_libraries(infcover ZLIB::ZLIBSTATIC)
+ target_compile_options(infcover PRIVATE -coverage)
+ target_link_options(infcover PRIVATE -coverage)
+ target_compile_definitions(
+ infcover PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
+ add_test(NAME zlib_coverage COMMAND infcover)
+ set(INFCOVER_DIR ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/infcover.dir)
+ add_test(
+ NAME zlib_coverage-summary
+ COMMAND
+ ${GCOV_EXECUTABLE} ${llvm_option}
+ ${CMAKE_CURRENT_SOURCE_DIR}/infcover.c -o
+ ${INFCOVER_DIR}/infcover.c.gcda)
set_tests_properties(zlib_coverage-summary
PROPERTIES
- FIXTURES_REQUIRED z_cover)
- set(CMAKE_C_FLAGS
- ${CFLAGS_OLD}
- CACHE STRING "" FORCE)
- endif(GCOV_EXECUTABLE)
+ DEPENDS zlib-coverage)
+ set(CMAKE_C_FLAGS
+ ${CFLAGS_OLD}
+ CACHE STRING "" FORCE)
endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
@@ -138,188 +126,219 @@ if(ZLIB_BUILD_STATIC)
endif(HAVE_OFF64_T)
endif(ZLIB_BUILD_STATIC)
-if(ZLIB_INSTALL)
- add_test(
- NAME zlib_install
- COMMAND ${CMAKE_COMMAND}
- --install ${zlib_BINARY_DIR}
- --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install
- --config $<CONFIG>
- WORKING_DIRECTORY ${zlib_BINARY_DIR})
-
- set_tests_properties(zlib_install PROPERTIES FIXTURES_SETUP zlib_install)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/zlib_findpackage_wrong_components_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test/CMakeLists.txt
- @ONLY)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_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)
- #
- # find_package_test
- #
- add_test(
- NAME zlib_find_package_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test)
-
- add_test(
- NAME zlib_find_package_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test_build)
-
- set_tests_properties(zlib_find_package_configure
- PROPERTIES
- FIXTURES_REQUIRED zlib_install
- FIXTURES_SETUP fp_config)
-
- set_tests_properties(zlib_find_package_build
- PROPERTIES
- FIXTURES_REQUIRED fp_config)
-
- #
- # find_package_no_components_test
- #
- add_test(
- NAME zlib_find_package_no_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test)
-
+add_test(
+ NAME zlib_install
+ COMMAND ${CMAKE_COMMAND}
+ --install ${zlib_BINARY_DIR}
+ --prefix ${CMAKE_CURRENT_BINARY_DIR}/test_install
+ --config $<CONFIG>
+ WORKING_DIRECTORY ${zlib_BINARY_DIR})
+
+set_tests_properties(zlib_install PROPERTIES FIXTURES_SETUP zlib_install)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_findpackage_wrong_components_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test/CMakeLists.txt @ONLY)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_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)
+#
+# find_package_test
+#
+add_test(
+ NAME zlib_find_package_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test)
+
+add_test(
+ NAME zlib_find_package_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test_build)
+
+add_test(
+ NAME zlib_find_package_test
+ COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test_build)
+
+set_tests_properties(zlib_find_package_configure
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_install
+ FIXTURES_SETUP fp_config)
+
+set_tests_properties(zlib_find_package_build
+ PROPERTIES
+ FIXTURES_REQUIRED fp_config
+ FIXTURES_SETUP fp_build)
+
+set_tests_properties(zlib_find_package_test
+ PROPERTIES
+ FIXTURES_REQUIRED fp_build
+ ENVIRONMENT
+ CTEST_OUTPUT_ON_FAILURE=1)
+
+#
+# find_package_no_components_test
+#
+add_test(
+ NAME zlib_find_package_no_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test)
+
+set_tests_properties(zlib_find_package_no_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_install)
+
+if(NOT ZLIB_BUILD_SHARED OR NOT ZLIB_BUILD_STATIC)
set_tests_properties(zlib_find_package_no_components_configure
PROPERTIES
- FIXTURES_REQUIRED zlib_install)
-
- if(NOT ZLIB_BUILD_SHARED OR NOT ZLIB_BUILD_STATIC)
- set_tests_properties(zlib_find_package_no_components_configure
- PROPERTIES
- WILL_FAIL TRUE)
- endif(NOT ZLIB_BUILD_SHARED OR NOT ZLIB_BUILD_STATIC)
-
- #
- # find_package_no_component_test
- #
- add_test(
- NAME zlib_find_package_wrong_components_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test)
-
- set_tests_properties(zlib_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED zlib_install
WILL_FAIL TRUE)
-
- #
- # add_subdirectory_test
- #
- add_test(
- NAME zlib_add_subdirectory_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test)
-
- add_test(
- NAME zlib_add_subdirectory_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test_build)
-
- set_tests_properties(zlib_add_subdirectory_configure
- PROPERTIES
- FIXTURES_REQUIRED zlib_install
- FIXTURES_SETUP as_config)
-
- set_tests_properties(zlib_add_subdirectory_build
- PROPERTIES
- FIXTURES_REQUIRED as_config)
-
- #
- # add_subdirectory_exclude_test
- #
- add_test(
- NAME zlib_add_subdirectory_exclude_configure
- COMMAND
- ${CMAKE_COMMAND}
- ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test_build
- -DCMAKE_BUILD_TYPE=$<CONFIG>
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
- -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
- -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test)
-
- add_test(
- NAME zlib_add_subdirectory_exclude_build
- COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test_build)
-
- set_tests_properties(zlib_add_subdirectory_exclude_configure
- PROPERTIES
- FIXTURES_REQUIRED zlib_install
- FIXTURES_SETUP asx_config)
-
- set_tests_properties(zlib_add_subdirectory_exclude_build
- PROPERTIES
- FIXTURES_REQUIRED as_config)
-endif(ZLIB_INSTALL)
+endif(NOT ZLIB_BUILD_SHARED OR NOT ZLIB_BUILD_STATIC)
+
+#
+# find_package_no_component_test
+#
+add_test(
+ NAME zlib_find_package_wrong_components_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test)
+
+set_tests_properties(zlib_find_package_wrong_components_configure
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_install
+ WILL_FAIL TRUE)
+
+#
+# add_subdirectory_test
+#
+add_test(
+ NAME zlib_add_subdirectory_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test)
+
+add_test(
+ NAME zlib_add_subdirectory_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test_build)
+
+add_test(
+ NAME zlib_add_subdirectory_test
+ COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test_build)
+
+set_tests_properties(zlib_add_subdirectory_configure
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_install
+ FIXTURES_SETUP as_config)
+
+set_tests_properties(zlib_add_subdirectory_build
+ PROPERTIES
+ FIXTURES_REQUIRED as_config
+ FIXTURES_SETUP as_build)
+
+set_tests_properties(zlib_add_subdirectory_test
+ PROPERTIES
+ FIXTURES_REQUIRED as_build
+ ENVIRONMENT
+ CTEST_OUTPUT_ON_FAILURE=1)
+
+#
+# add_subdirectory_exclude_test
+#
+add_test(
+ NAME zlib_add_subdirectory_exclude_configure
+ COMMAND
+ ${CMAKE_COMMAND}
+ ${PLATFORM}
+ -B${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test_build
+ -DCMAKE_BUILD_TYPE=$<CONFIG>
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+ -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test)
+
+add_test(
+ NAME zlib_add_subdirectory_exclude_build
+ COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+ WORKING_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test_build)
+
+add_test(
+ NAME zlib_add_subdirectory_exclude_test
+ COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>
+ WORKING_DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test_build)
+
+set_tests_properties(zlib_add_subdirectory_exclude_configure
+ PROPERTIES
+ FIXTURES_REQUIRED zlib_install
+ FIXTURES_SETUP asx_config)
+
+set_tests_properties(zlib_add_subdirectory_exclude_build
+ PROPERTIES
+ FIXTURES_REQUIRED as_config
+ FIXTURES_SETUP asx_build)
+
+set_tests_properties(zlib_add_subdirectory_exclude_test
+ PROPERTIES
+ FIXTURES_REQUIRED asx_build
+ ENVIRONMENT
+ CTEST_OUTPUT_ON_FAILURE=1)