Commit b2ed197 for zlib
commit b2ed1975cf6dbbab61e20d5d8c41f82e9f64f285
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Fri Feb 27 12:13:59 2026 +0100
CMake: Consolidate build tests in the test directory.
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 1d0e0b7..5c49800 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -38,7 +38,7 @@ function(zlib_add_contrib_feature name description dir)
endif(ZLIB_WITH_${name})
endfunction(zlib_add_contrib_feature name description dir)
-set(WORK_DIR ${zlib_BINARY_DIR})
+set(WORK_DIR ${zlib_BINARY_DIR}/test)
set(inst_setup zlib_install)
zlib_add_contrib_feature("GVMAT64"
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index 15a158d..302d313 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -1,45 +1,45 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_BLAST)
- set(WORK_DIR ${blast_BINARY_DIR})
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(inst_setup zlib_blast_install)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
NAME zlib_blast_install
COMMAND ${CMAKE_COMMAND} --install ${blast_BINARY_DIR} --prefix
- ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG>
- WORKING_DIRECTORY ${blast_BINARY_DIR})
+ ${WORK_DIR}/test_install --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
set_tests_properties(zlib_blast_install
PROPERTIES
FIXTURES_SETUP zlib_blast_install)
endif(NOT DEFINED ZLIB_BUILD_BLAST)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/blast_find_package_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/blast_add_subdirectory_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/blast_add_subdirectory_exclude_test)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/blast_find_package_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/blast_add_subdirectory_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
+ ${WORK_DIR}/blast_add_subdirectory_exclude_test/CMakeLists.txt
@ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test/CMakeLists.txt
+ ${WORK_DIR}/blast_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}/findpackage_wrong_components_test/CMakeLists.txt
+ ${WORK_DIR}/blast_find_package_wrong_components_test/CMakeLists.txt
@ONLY)
# CMAKE_GENERATOR_PLATFORM doesn't work in the if
@@ -56,19 +56,19 @@ add_test(
NAME zlib_blast_find_package_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+ -S${WORK_DIR}/blast_find_package_test)
add_test(
NAME zlib_blast_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/blast_find_package_test_build)
set_tests_properties(
zlib_blast_find_package_configure
@@ -87,19 +87,19 @@ add_test(
NAME zlib_blast_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
+ -S${WORK_DIR}/blast_add_subdirectory_test)
add_test(
NAME zlib_blast_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/blast_add_subdirectory_test_build)
set_tests_properties(
zlib_blast_add_subdirectory_configure
@@ -118,20 +118,20 @@ add_test(
NAME zlib_blast_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+ -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
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
+ ${WORK_DIR}/blast_add_subdirectory_exclude_test_build)
set_tests_properties(zlib_blast_add_subdirectory_exclude_configure
PROPERTIES
@@ -149,13 +149,13 @@ add_test(
NAME zlib_blast_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test)
+ -S${WORK_DIR}/blast_find_package_no_components_test)
set_tests_properties(
zlib_blast_find_package_no_components_configure
@@ -175,13 +175,13 @@ add_test(
NAME zlib_blast_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test)
+ -S${WORK_DIR}/blast_find_package_wrong_components_test)
set_tests_properties(zlib_blast_find_package_wrong_components_configure
PROPERTIES
diff --git a/contrib/iostream3/test/CMakeLists.txt b/contrib/iostream3/test/CMakeLists.txt
index fc4205e..9cf6bb7 100644
--- a/contrib/iostream3/test/CMakeLists.txt
+++ b/contrib/iostream3/test/CMakeLists.txt
@@ -1,45 +1,45 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
- set(WORK_DIR ${iostreamV3_BINARY_DIR})
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(inst_setup zlib_iostream3_install)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
NAME zlib_iostream3_install
COMMAND ${CMAKE_COMMAND} --install ${iostreamV3_BINARY_DIR} --prefix
- ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG>
- WORKING_DIRECTORY ${iostreamV3_BINARY_DIR})
+ ${WORK_DIR}/test_install --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
set_tests_properties(zlib_iostream3_install
PROPERTIES
FIXTURES_SETUP zlib_iostream3_install)
endif(NOT DEFINED ZLIB_BUILD_IOSTREAM3)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/iostream3_find_package_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/iostream3_add_subdirectory_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/iostream3_add_subdirectory_exclude_test)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/iostream3_find_package_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/iostream3_add_subdirectory_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
+ ${WORK_DIR}/iostream3_add_subdirectory_exclude_test/CMakeLists.txt
@ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test/CMakeLists.txt
+ ${WORK_DIR}/iostream3_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}/findpackage_wrong_components_test/CMakeLists.txt
+ ${WORK_DIR}/iostream3_find_package_wrong_components_test/CMakeLists.txt
@ONLY)
# CMAKE_GENERATOR_PLATFORM doesn't work in the if
@@ -57,19 +57,19 @@ add_test(
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+ -S${WORK_DIR}/iostream3_find_package_test)
add_test(
NAME zlib_iostream3_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/iostream3_find_package_test_build)
set_tests_properties(zlib_iostream3_find_package_configure
PROPERTIES
@@ -88,20 +88,20 @@ add_test(
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
+ -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/test_install
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
+ -S${WORK_DIR}/iostream3_add_subdirectory_test)
add_test(
NAME zlib_iostream3_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/iostream3_add_subdirectory_test_build)
set_tests_properties(zlib_iostream3_add_subdirectory_configure
PROPERTIES
@@ -119,19 +119,19 @@ add_test(
NAME zlib_iostream3_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+ -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
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
+ ${WORK_DIR}/iostream3_add_subdirectory_exclude_test_build)
set_tests_properties(zlib_iostream3_add_subdirectory_exclude_configure
PROPERTIES
@@ -149,13 +149,13 @@ add_test(
NAME zlib_iostream3_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test)
+ -S${WORK_DIR}/iostream3_find_package_no_components_test)
set_tests_properties(zlib_iostream3_find_package_no_components_configure
PROPERTIES
@@ -174,13 +174,13 @@ add_test(
NAME zlib_iostream3_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test)
+ -S${WORK_DIR}/iostream3_find_package_wrong_components_test)
set_tests_properties(zlib_iostream3_find_package_wrong_components_configure
PROPERTIES
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index f07f3f3..4726a65 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -1,47 +1,47 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_MINIZIP)
- set(WORK_DIR ${minizip_BINARY_DIR})
+ 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
- ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG>
- WORKING_DIRECTORY ${minizip_BINARY_DIR})
+ ${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)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_componentstest)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/minizip_find_package_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/minizip_find_package_no_componentstest)
+file(MAKE_DIRECTORY ${WORK_DIR}/minizip_find_package_wrong_components_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/minizip_add_subdirectory_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/minizip_add_subdirectory_exclude_test)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/minizip_find_package_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test/CMakeLists.txt
+ ${WORK_DIR}/minizip_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}/findpackage_wrong_components_test/CMakeLists.txt
+ ${WORK_DIR}/minizip_find_package_wrong_components_test/CMakeLists.txt
@ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/minizip_add_subdirectory_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
+ ${WORK_DIR}/minizip_add_subdirectory_exclude_test/CMakeLists.txt
@ONLY)
# CMAKE_GENERATOR_PLATFORM doesn't work in the if
@@ -58,17 +58,17 @@ add_test(
NAME minizip_find_package_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+ -S${WORK_DIR}/minizip_find_package_test)
add_test(
NAME minizip_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/minizip_find_package_test_build)
set_tests_properties(
minizip_find_package_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup}
@@ -84,12 +84,12 @@ add_test(
NAME minizip_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test)
+ -S${WORK_DIR}/minizip_find_package_no_components_test)
set_tests_properties(
minizip_find_package_no_components_configure PROPERTIES FIXTURES_REQUIRED ${inst_setup})
@@ -106,12 +106,12 @@ add_test(
NAME minizip_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test)
+ -S${WORK_DIR}/minizip_find_package_wrong_components_test)
set_tests_properties(
minizip_find_package_wrong_components_configure
@@ -126,17 +126,17 @@ add_test(
NAME minizip_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
+ -S${WORK_DIR}/minizip_add_subdirectory_test)
add_test(
NAME minizip_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/minizip_add_subdirectory_test_build)
set_tests_properties(
minizip_add_subdirectory_configure
@@ -152,18 +152,18 @@ add_test(
NAME minizip_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
+ -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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+ -S${WORK_DIR}/minizip_add_subdirectory_exclude_test)
add_test(
NAME minizip_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
+ ${WORK_DIR}/minizip_add_subdirectory_exclude_test_build)
set_tests_properties(
minizip_add_subdirectory_exclude_configure
diff --git a/contrib/puff/test/CMakeLists.txt b/contrib/puff/test/CMakeLists.txt
index a20f312..5230cce 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -1,14 +1,14 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_PUFF)
- set(WORK_DIR ${puff_BINARY_DIR})
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(inst_setup zlib_puff_install)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
NAME zlib_puff_install
COMMAND ${CMAKE_COMMAND} --install ${puff_BINARY_DIR} --prefix
- ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG>
- WORKING_DIRECTORY ${puff_BINARY_DIR})
+ ${WORK_DIR}/test_install --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
set_tests_properties(zlib_puff_install
PROPERTIES
@@ -86,31 +86,31 @@ if(ZLIB_PUFF_BUILD_STATIC AND NOT WIN32)
endif(GCOV_EXECUTABLE)
endif(ZLIB_PUFF_BUILD_STATIC AND NOT WIN32)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/puff_findpackage_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/puff_add_subdirectory_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/puff_add_subdirectory_exclude_test)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/puff_find_package_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/puff_add_subdirectory_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
+ ${WORK_DIR}/puff_add_subdirectory_exclude_test/CMakeLists.txt
@ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_no_components_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test/CMakeLists.txt
+ ${WORK_DIR}/puff_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}/findpackage_wrong_components_test/CMakeLists.txt
+ ${WORK_DIR}/puff_find_package_wrong_components_test/CMakeLists.txt
@ONLY)
# CMAKE_GENERATOR_PLATFORM doesn't work in the if
@@ -128,20 +128,20 @@ add_test(
COMMAND
${CMAKE_COMMAND}
${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+ -B${WORK_DIR}/puff_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/test_install
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+ -S${WORK_DIR}/puff_find_package_test)
add_test(
NAME zlib_puff_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/puff_find_package_test_build)
set_tests_properties(zlib_puff_find_package_configure
PROPERTIES
@@ -159,19 +159,19 @@ add_test(
NAME zlib_puff_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
+ -B${WORK_DIR}/puff_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
+ -S${WORK_DIR}/puff_add_subdirectory_test)
add_test(
NAME zlib_puff_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/puff_add_subdirectory_test_build)
set_tests_properties(zlib_puff_add_subdirectory_configure
PROPERTIES
@@ -189,19 +189,19 @@ add_test(
NAME zlib_puff_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
+ -B${WORK_DIR}/puff_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+ -S${WORK_DIR}/puff_add_subdirectory_exclude_test)
add_test(
NAME zlib_puff_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
+ ${WORK_DIR}/puff_add_subdirectory_exclude_test_build)
set_tests_properties(zlib_puff_add_subdirectory_exclude_configure
PROPERTIES
@@ -219,13 +219,13 @@ add_test(
NAME zlib_puff_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test_build
+ -B${WORK_DIR}/puff_findpackage_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test)
+ -S${WORK_DIR}/puff_find_package_no_components_test)
set_tests_properties(
zlib_puff_find_package_no_components_configure
@@ -245,13 +245,13 @@ add_test(
NAME zlib_puff_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test_build
+ -B${WORK_DIR}/puff_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh
-G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test)
+ -S${WORK_DIR}/puff_find_package_wrong_components_test)
set_tests_properties(zlib_puff_find_package_wrong_components_configure
PROPERTIES
diff --git a/contrib/zlib1-dll/test/CMakeLists.txt b/contrib/zlib1-dll/test/CMakeLists.txt
index 650e778..6512449 100644
--- a/contrib/zlib1-dll/test/CMakeLists.txt
+++ b/contrib/zlib1-dll/test/CMakeLists.txt
@@ -1,35 +1,35 @@
# if we are built from with zlib, use this path's)
if(NOT DEFINED ZLIB_BUILD_ZLIB1_DLL)
- set(WORK_DIR ${zlib1-dll_BINARY_DIR})
+ set(WORK_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(inst_setup zlib1-dll_install)
set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
add_test(
NAME zlib1-dll_install
COMMAND ${CMAKE_COMMAND} --install ${zlib1-dll_BINARY_DIR} --prefix
- ${CMAKE_CURRENT_BINARY_DIR}/test_install --config $<CONFIG>
- WORKING_DIRECTORY ${zlib1-dll_BINARY_DIR})
+ ${WORK_DIR}/test_install --config $<CONFIG>
+ WORKING_DIRECTORY ${WORK_DIR})
set_tests_properties(zlib1-dll_install
PROPERTIES
FIXTURES_SETUP zlib1-dll_install)
endif(NOT DEFINED ZLIB_BUILD_ZLIB1_DLL)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/zlib1-dll_find_package_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/zlib1-dll_add_subdirectory_test)
+file(MAKE_DIRECTORY ${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/zlib1-dll_find_package_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test/CMakeLists.txt @ONLY)
+ ${WORK_DIR}/zlib1-dll_add_subdirectory_test/CMakeLists.txt @ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/add_subdirectory_exclude_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test/CMakeLists.txt
+ ${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test/CMakeLists.txt
@ONLY)
# CMAKE_GENERATOR_PLATFORM doesn't work in the if
@@ -46,17 +46,17 @@ add_test(
NAME zlib1-dll_find_package_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+ -B${WORK_DIR}/zlib1-dll_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
+ -S${WORK_DIR}/zlib1-dll_find_package_test)
add_test(
NAME zlib1-dll_find_package_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/zlib1-dll_find_package_test_build)
set_tests_properties(
zlib1-dll_find_package_configure
@@ -75,17 +75,17 @@ add_test(
NAME zlib1-dll_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
+ -B${WORK_DIR}/zlib1-dll_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
+ -S${WORK_DIR}/zlib1-dll_add_subdirectory_test)
add_test(
NAME zlib1-dll_add_subdirectory_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build)
+ WORKING_DIRECTORY ${WORK_DIR}/zlib1-dll_add_subdirectory_test_build)
set_tests_properties(
zlib1-dll_add_subdirectory_configure
@@ -102,18 +102,18 @@ add_test(
NAME zlib1-dll_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
+ -B${WORK_DIR}/zlib1-dll_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/test_install ${ZLIB_ARG}
+ -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
--fresh -G "${CMAKE_GENERATOR}"
- -S${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+ -S${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test)
add_test(
NAME zlib1-dll_add_subdirectory_exclude_build
COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
WORKING_DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build)
+ ${WORK_DIR}/zlib1-dll_add_subdirectory_exclude_test_build)
set_tests_properties(
zlib1-dll_add_subdirectory_exclude_configure
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e6a9766..56766ea 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -135,31 +135,31 @@ add_test(
set_tests_properties(zlib_install PROPERTIES FIXTURES_SETUP zlib_install)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/find_package_no_components_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/find_package_wrong_components_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/find_package_test.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test/CMakeLists.txt @ONLY)
+ ${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}/findpackage_no_components_test/CMakeLists.txt @ONLY)
+ ${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}/findpackage_wrong_components_test/CMakeLists.txt @ONLY)
+ ${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}/add_subdirectory_test/CMakeLists.txt @ONLY)
+ ${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}/add_subdirectory_exclude_test/CMakeLists.txt
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test/CMakeLists.txt
@ONLY)
# CMAKE_GENERATOR_PLATFORM doesn't work in the if
@@ -175,21 +175,21 @@ add_test(
NAME zlib_find_package_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_test_build
+ -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}/findpackage_test)
+ -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}/findpackage_test_build)
+ 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}/findpackage_test_build)
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test_build)
set_tests_properties(
zlib_find_package_configure PROPERTIES FIXTURES_REQUIRED zlib_install
@@ -210,12 +210,12 @@ add_test(
NAME zlib_find_package_no_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_no_components_test_build
+ -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}/findpackage_no_components_test)
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test)
set_tests_properties(
zlib_find_package_no_components_configure
@@ -234,12 +234,12 @@ add_test(
NAME zlib_find_package_wrong_components_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/findpackage_wrong_components_test_build
+ -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}/findpackage_wrong_components_test)
+ -S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test)
set_tests_properties(
zlib_find_package_wrong_components_configure
@@ -253,21 +253,21 @@ add_test(
NAME zlib_add_subdirectory_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test_build
+ -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}/findpackage_test)
+ -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}/add_subdirectory_test_build)
+ 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}/add_subdirectory_test_build)
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test_build)
set_tests_properties(
zlib_add_subdirectory_configure PROPERTIES FIXTURES_REQUIRED zlib_install
@@ -288,23 +288,23 @@ add_test(
NAME zlib_add_subdirectory_exclude_configure
COMMAND
${CMAKE_COMMAND} ${PLATFORM}
- -B${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_exclude_test_build
+ -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}/findpackage_test)
+ -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}/add_subdirectory_exclude_test_build)
+ ${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}/add_subdirectory_exclude_test_build)
+ ${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test_build)
set_tests_properties(
zlib_add_subdirectory_exclude_configure