Commit 25e021a for zlib
commit 25e021a3e5ec6bde8923b4a0ac6ddef6bd80bf4e
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Wed Mar 18 15:14:38 2026 +0100
CMake: Avoid running integration tests when not installing.
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index 566561a..7c12eff 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -1,220 +1,220 @@
# if we are built from with zlib, use this path's)
-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}")
+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 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
+ 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}
+ --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_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}
- --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}
- --fresh
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/blast_add_subdirectory_test)
-
-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}
- --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
+ 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_add_subdirectory_test)
+
+ 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_asx_config)
-
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}blast_add_subdirectory_exclude_build
- 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}
- --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
+ 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}
+ --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
PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+ 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/blast_find_package_no_components_test)
-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}
- --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)
-
-###########################################################################################################################################
+ 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}
+ --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
diff --git a/contrib/iostream3/test/CMakeLists.txt b/contrib/iostream3/test/CMakeLists.txt
index 7646147..16af153 100644
--- a/contrib/iostream3/test/CMakeLists.txt
+++ b/contrib/iostream3/test/CMakeLists.txt
@@ -1,222 +1,224 @@
# if we are built from with zlib, use this path's)
-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(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}")
+
+ 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_find_package_test)
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
+ 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_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}
- --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)
+ 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}
- --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_find_package_build
+ PROPERTIES
+ FIXTURES_REQUIRED iostream3_fp_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}
- --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
+ #
+ # 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}
+ --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_asx_config)
+ FIXTURES_SETUP iostream3_as_config)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_exclude_build
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}iostream3_add_subdirectory_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}
- --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})
+ 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}
+ --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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_find_package_no_components_test)
-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)
+ 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/iostream3_find_package_wrong_components_test)
-#
-# find_package_no_components_test
-#
-add_test(
- NAME
+ set_tests_properties(
${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}
- --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)
+ PROPERTIES
+ FIXTURES_REQUIRED ${inst_setup}
+ WILL_FAIL TRUE)
+endif(ZLIB_IOSTREAM3_INSTALL)
if(ZLIB_IOSTREAM3_BUILD_SHARED)
add_executable(${ZLIB_CONTRIB_PREFIX}iostream3_test
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index 765111d..e7db9e9 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -1,202 +1,208 @@
# if we are built from with zlib, use this path's)
-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(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}")
- 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)
+ add_test(
+ NAME minizip_install
+ COMMAND ${CMAKE_COMMAND}
+ --install ${minizip_BINARY_DIR}
+ --prefix ${WORK_DIR}/test_install
+ --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
-configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${WORK_DIR}/minizip_find_package_no_components_test/CMakeLists.txt
- @ONLY)
+ set_tests_properties(minizip_install
+ PROPERTIES
+ FIXTURES_SETUP minizip_install)
+ endif(NOT DEFINED ZLIB_BUILD_MINIZIP)
-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}/find_package_test.cmake.in
+ ${WORK_DIR}/minizip_find_package_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}/find_package_no_components_test.cmake.in
+ ${WORK_DIR}/minizip_find_package_no_components_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)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/find_package_wrong_components_test.cmake.in
+ ${WORK_DIR}/minizip_find_package_wrong_components_test/CMakeLists.txt
+ @ONLY)
-# CMAKE_GENERATOR_PLATFORM doesn't work in the if
-set(GENERATOR ${CMAKE_GENERATOR_PLATFORM})
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
+ ${WORK_DIR}/minizip_add_subdirectory_test/CMakeLists.txt
+ @ONLY)
-if(GENERATOR)
- set(PLATFORM "-A ${GENERATOR}")
-endif(GENERATOR)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
+ ${WORK_DIR}/minizip_add_subdirectory_exclude_test/CMakeLists.txt
+ @ONLY)
-#
-# 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}
- --fresh
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_find_package_test)
+ # CMAKE_GENERATOR_PLATFORM doesn't work in the if
+ set(GENERATOR ${CMAKE_GENERATOR_PLATFORM})
-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)
+ if(GENERATOR)
+ set(PLATFORM "-A ${GENERATOR}")
+ endif(GENERATOR)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- FIXTURES_SETUP mzfp_config)
+ #
+ # 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_find_package_test)
-set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_build
- PROPERTIES
- FIXTURES_REQUIRED mzfp_config)
+ 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)
-#
-# 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}
- --fresh
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_find_package_no_components_test)
+ 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_no_components_configure
+ set_tests_properties(${ZLIB_CONTRIB_PREFIX}minizip_find_package_build
PROPERTIES
- FIXTURES_REQUIRED ${inst_setup})
+ 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_find_package_no_components_test)
-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)
+ FIXTURES_REQUIRED ${inst_setup})
-#
-# 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}
- --fresh
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_find_package_wrong_components_test)
+ 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)
-set_tests_properties(
- ${ZLIB_CONTRIB_PREFIX}minizip_find_package_wrong_components_configure
- PROPERTIES
- FIXTURES_REQUIRED ${inst_setup}
- WILL_FAIL TRUE)
+ #
+ # 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}
+ --fresh
+ -G "${CMAKE_GENERATOR}"
+ -S${WORK_DIR}/minizip_find_package_wrong_components_test)
-#
-# 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}
- --fresh
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_add_subdirectory_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}
+ --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)
+ 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_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)
+ 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}
- --fresh
- -G "${CMAKE_GENERATOR}"
- -S${WORK_DIR}/minizip_add_subdirectory_exclude_test)
+ #
+ # 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}
+ --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)
+ 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_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)
+ 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")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e7de5ae..976926f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -136,182 +136,188 @@ if(ZLIB_BUILD_STATIC)
endif(HAVE_OFF64_T)
endif(ZLIB_BUILD_STATIC)
-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)
-
-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
- --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)
+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
+ --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
+ --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
+ 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
+ --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)
-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)
-
-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
- --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)
+
+ #
+ # 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)
+
+ 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
+ --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)