From 6cbc63b1907dcb3dc03ae7da21944bc0e5f80864 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Tue, 1 Apr 2025 14:21:30 +0000 Subject: [PATCH] Use same CMake minimum version in DownloadProject configuration We already have a top-level minimum requirement for CMake >= 3.8, so don't need to specify a lower requirement in a file included from the top level. Having a requirement as low as 2.8.2 broke building on newer version of CMake, which error with "Compatibility with CMake < 3.5 has been removed from CMake." (seen in GitHub runners with Ubuntu 24.04). --- .github/workflows/pull-request-checks.yaml | 2 +- cmake/DownloadProject.CMakeLists.cmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml index 8ab4a9e7e86..266da10a0d2 100644 --- a/.github/workflows/pull-request-checks.yaml +++ b/.github/workflows/pull-request-checks.yaml @@ -51,7 +51,7 @@ jobs: - name: Build with make run: | git clone https://github.com/conp-solutions/riss riss.git - cmake -Hriss.git -Briss.git/release -DCMAKE_BUILD_TYPE=Release + cmake -Hriss.git -Briss.git/release -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5 make -C riss.git/release riss-coprocessor-lib-static -j${{env.linux-vcpus}} make -C src -j${{env.linux-vcpus}} CXX="ccache g++" LIBS="$PWD/riss.git/release/lib/libriss-coprocessor.a -lpthread" IPASIR=$PWD/riss.git/riss make -C jbmc/src -j${{env.linux-vcpus}} CXX="ccache g++" LIBS="$PWD/riss.git/release/lib/libriss-coprocessor.a -lpthread" IPASIR=$PWD/riss.git/riss diff --git a/cmake/DownloadProject.CMakeLists.cmake.in b/cmake/DownloadProject.CMakeLists.cmake.in index 89be4fdd4f2..e0ba9b27714 100644 --- a/cmake/DownloadProject.CMakeLists.cmake.in +++ b/cmake/DownloadProject.CMakeLists.cmake.in @@ -1,7 +1,7 @@ # Distributed under the OSI-approved MIT License. See accompanying # file LICENSE or https://github.com/Crascit/DownloadProject for details. -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.8) project(${DL_ARGS_PROJ}-download NONE)