Commit 723dde6 for zlib
commit 723dde60d58c7b832dfceab54363a9f3960dec8f
Author: git@github.com <git@github.com>
Date: Sun Nov 1 21:36:46 2026 +0100
CMake: Don't use --fresh before cmake 3.24.
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index 436e2e1..fcbedbe 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -63,7 +63,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -97,7 +97,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -131,7 +131,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -166,7 +166,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -196,7 +196,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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 271ba50..0abc92b 100644
--- a/contrib/iostream3/test/CMakeLists.txt
+++ b/contrib/iostream3/test/CMakeLists.txt
@@ -63,7 +63,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -97,7 +97,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -131,7 +131,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -166,7 +166,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -196,7 +196,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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 408a433..d70a260 100644
--- a/contrib/minizip/test/CMakeLists.txt
+++ b/contrib/minizip/test/CMakeLists.txt
@@ -63,7 +63,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -97,7 +97,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -127,7 +127,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -151,7 +151,7 @@ add_test(
"-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -185,7 +185,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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 50154e3..75c8d27 100644
--- a/contrib/puff/test/CMakeLists.txt
+++ b/contrib/puff/test/CMakeLists.txt
@@ -136,7 +136,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -204,7 +204,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -239,7 +239,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -269,7 +269,7 @@ add_test(
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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/contrib/zlib1-dll/test/CMakeLists.txt b/contrib/zlib1-dll/test/CMakeLists.txt
index 71c8b72..5d7c355 100644
--- a/contrib/zlib1-dll/test/CMakeLists.txt
+++ b/contrib/zlib1-dll/test/CMakeLists.txt
@@ -51,7 +51,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}/zlib1-dll_find_package_test)
@@ -83,7 +83,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}/zlib1-dll_add_subdirectory_test)
@@ -115,7 +115,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}/zlib1-dll_add_subdirectory_exclude_test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0bace5d..aa9b69b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -180,7 +180,7 @@ add_test(
"-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -225,7 +225,7 @@ add_test(
"-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -254,7 +254,7 @@ add_test(
"-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -278,7 +278,7 @@ add_test(
"-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)
@@ -323,7 +323,7 @@ add_test(
"-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}"
-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)