Commit d491f4a for zlib
commit d491f4a609b368658a6bf0288383cf9da01d5b74
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Wed Mar 18 15:49:28 2026 +0100
CMake: Fix tests with pre-3.24 cmake updates.
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index 7c12eff..35542ba 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -77,7 +77,7 @@ if (ZLIB_BLAST_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_find_package_test)
@@ -109,7 +109,7 @@ if (ZLIB_BLAST_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_add_subdirectory_test)
@@ -141,7 +141,7 @@ if (ZLIB_BLAST_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_add_subdirectory_exclude_test)
@@ -175,7 +175,7 @@ if (ZLIB_BLAST_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_find_package_no_components_test)
@@ -205,7 +205,7 @@ if (ZLIB_BLAST_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/blast_find_package_wrong_components_test)
diff --git a/contrib/iostream3/test/CMakeLists.txt b/contrib/iostream3/test/CMakeLists.txt
index 16af153..88ba19d 100644
--- a/contrib/iostream3/test/CMakeLists.txt
+++ b/contrib/iostream3/test/CMakeLists.txt
@@ -79,7 +79,7 @@ if(ZLIB_IOSTREAM3_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_find_package_test)
@@ -111,7 +111,7 @@ if(ZLIB_IOSTREAM3_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_add_subdirectory_test)
@@ -143,7 +143,7 @@ if(ZLIB_IOSTREAM3_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_add_subdirectory_exclude_test)
@@ -178,7 +178,7 @@ if(ZLIB_IOSTREAM3_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_find_package_no_components_test)
@@ -209,7 +209,7 @@ if(ZLIB_IOSTREAM3_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/iostream3_find_package_wrong_components_test)
diff --git a/contrib/minizip/test/CMakeLists.txt b/contrib/minizip/test/CMakeLists.txt
index e7db9e9..a909a24 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -64,7 +64,7 @@ if(ZLIB_MINIZIP_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_find_package_test)
@@ -96,7 +96,7 @@ if(ZLIB_MINIZIP_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_find_package_no_components_test)
@@ -126,7 +126,7 @@ if(ZLIB_MINIZIP_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_find_package_wrong_components_test)
@@ -149,7 +149,7 @@ if(ZLIB_MINIZIP_INSTALL)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install ${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_add_subdirectory_test)
@@ -182,7 +182,7 @@ if(ZLIB_MINIZIP_INSTALL)
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/minizip_add_subdirectory_exclude_test)
diff --git a/contrib/puff/test/CMakeLists.txt b/contrib/puff/test/CMakeLists.txt
index 3701814..2a391ff 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -138,7 +138,7 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_test)
@@ -170,7 +170,7 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_add_subdirectory_test)
@@ -202,7 +202,7 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_add_subdirectory_exclude_test)
@@ -236,7 +236,7 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_no_components_test)
@@ -266,7 +266,7 @@ add_test(
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${WORK_DIR}/test_install
${ZLIB_ARG}
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${WORK_DIR}/puff_find_package_wrong_components_test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 976926f..44c9933 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -191,7 +191,7 @@ if(ZLIB_INSTALL)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_test)
@@ -222,7 +222,7 @@ if(ZLIB_INSTALL)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_no_components_test)
@@ -249,7 +249,7 @@ if(ZLIB_INSTALL)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${CMAKE_CURRENT_BINARY_DIR}/zlib_find_package_wrong_components_test)
@@ -271,7 +271,7 @@ if(ZLIB_INSTALL)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_test)
@@ -302,7 +302,7 @@ if(ZLIB_INSTALL)
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/test_install
- --fresh
+ $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},"3.24">:--fresh>
-G "${CMAKE_GENERATOR}"
-S${CMAKE_CURRENT_BINARY_DIR}/zlib_add_subdirectory_exclude_test)