From efbbc3bbc8a8ccf10ed14c54e5228988b36d3adc Mon Sep 17 00:00:00 2001 From: Tim Haines Date: Mon, 16 Dec 2024 12:54:35 -0600 Subject: [PATCH] cstest: use DOWNLOAD_EXTRACT_TIMESTAMP conditionally (#2581) * cstest: use DOWNLOAD_EXTRACT_TIMESTAMP conditionally This feature was added in CMake 3.24.0, so this allows older CMakes to still build the tests. * Fix comparison * Use POLICY CMP0135 --- suite/cstest/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/suite/cstest/CMakeLists.txt b/suite/cstest/CMakeLists.txt index 51bcae1e..53a33f06 100644 --- a/suite/cstest/CMakeLists.txt +++ b/suite/cstest/CMakeLists.txt @@ -1,15 +1,20 @@ cmake_minimum_required(VERSION 3.15) +# Enable DOWNLOAD_EXTRACT_TIMESTAMP +if(POLICY CMP0135) + cmake_policy(SET CMP0135 NEW) +endif() + include(ExternalProject) find_library(libyaml NAMES libyaml yaml REQUIRED) set(CMOCKA_LIB_FILE "${CMAKE_CURRENT_BINARY_DIR}/extern/src/cmocka_ext-build/src/libcmocka.a") + ExternalProject_Add(cmocka_ext PREFIX extern URL "https://cmocka.org/files/1.1/cmocka-1.1.7.tar.xz" URL_HASH SHA256=810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82 - DOWNLOAD_EXTRACT_TIMESTAMP true CONFIGURE_COMMAND cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ../cmocka_ext/ BUILD_COMMAND cmake --build . --config Release BUILD_BYPRODUCTS "${CMOCKA_LIB_FILE}" @@ -27,7 +32,6 @@ ExternalProject_Add(libcyaml_ext PREFIX extern URL "https://github.com/tlsa/libcyaml/archive/refs/tags/v1.4.2.tar.gz" URL_HASH SHA256=3211b2a0589ebfe02c563c96adce9246c0787be2af30353becbbd362998d16dc - DOWNLOAD_EXTRACT_TIMESTAMP true CONFIGURE_COMMAND "" BUILD_COMMAND make VARIANT=${LIBCYAML_VARIANT} PKG_CONFIG=pkg-config BUILD_BYPRODUCTS "${LIBCYAML_LIB_FILE}"