From c11fa520846a5193f1510be171256a0eff177952 Mon Sep 17 00:00:00 2001 From: teseoch Date: Tue, 1 Apr 2025 09:49:41 -0700 Subject: [PATCH 1/2] cmake4 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5bd5435..91826934 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,12 @@ endif() set(REQUIRED_CMAKE_VERSION "3.18.0") if(POLYSOLVE_TOPLEVEL_PROJECT) cmake_minimum_required(VERSION ${REQUIRED_CMAKE_VERSION}) + SET(CMAKE_POLICY_VERSION_MINIMUM ${REQUIRED_CMAKE_VERSION}) + if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0.0") + message(WARNING "CMake version is ${CMAKE_VERSION}, setting stuff for dependencies.") + SET(CMAKE_POLICY_VERSION_MINIMUM ${REQUIRED_CMAKE_VERSION}) + set(POLYSOLVE_WITH_AMGCL OFF CACHE BOOL "Use AMGCL for solving linear systems") + endif() else() # Don't use cmake_minimum_required here to avoid implicitly overriding parent policies if(${CMAKE_VERSION} VERSION_LESS ${REQUIRED_CMAKE_VERSION}) From 03c69f586920187e212767f20f4167fae6bed5e5 Mon Sep 17 00:00:00 2001 From: teseoch Date: Tue, 1 Apr 2025 09:58:09 -0700 Subject: [PATCH 2/2] cache --- .github/workflows/continuous.yml | 4 ++-- .github/workflows/coverage.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 493bdc01..16b61bbd 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -54,7 +54,7 @@ jobs: - name: Cache Build id: cache-build - uses: actions/cache@v4.0.2 + uses: actions/cache@v4 with: path: ${{ env.CACHE_PATH }} key: ${{ runner.os }}-${{ matrix.config }}-cache-${{ github.sha }} @@ -106,7 +106,7 @@ jobs: - name: Cache build id: cache-build - uses: actions/cache@v4.0.2 + uses: actions/cache@v4 with: path: ${{ env.appdata }}\Mozilla\sccache key: ${{ runner.os }}-${{ matrix.config }}-cache-${{ github.sha }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 043b1fc2..ba40ccb9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -41,7 +41,7 @@ jobs: - name: Cache Build id: cache-build - uses: actions/cache@v4.0.2 + uses: actions/cache@v4 with: path: ${{ env.CACHE_PATH }} key: ${{ runner.os }}-Release-${{ matrix.threading }}-cache-${{ github.sha }}