cmake >= 3.20 tested in CI

scivision · Jul 31, 2024 · b9ddf60 · b9ddf60
1 parent be5e803
commit b9ddf60
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -65,10 +65,10 @@ jobs:
       uses: ./.github/workflows/composite-example
 
 
-  cmake-320:
+  cmake-older:
     timeout-minutes: 30
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:

diff --git a/.github/workflows/composite-cmake/action.yml b/.github/workflows/composite-cmake/action.yml
@@ -3,17 +3,23 @@ runs:
   using: "composite"
 
   steps:
+  - name: environment
+    shell: bash
+    run: |
+      echo "osarch=linux-x86_64" >> $GITHUB_ENV
+      echo "archive=linux-x86_64.tar.gz" >> $GITHUB_ENV
+
   - name: Install CMake ${{ matrix.cmake_version }}
     shell: bash
     run: |
-      curl -LO "https://github.com/Kitware/CMake/releases/download/v${{ matrix.cmake_version }}/cmake-${{ matrix.cmake_version }}-linux-x86_64.tar.gz"
-      tar -xf cmake-${{ matrix.cmake_version }}-linux-x86_64.tar.gz
+      curl -LO "https://github.com/Kitware/CMake/releases/download/v${{ matrix.cmake_version }}/cmake-${{ matrix.cmake_version }}-$archive"
+      tar -xf cmake-${{ matrix.cmake_version }}-$archive
 
   - name: CMake path
     shell: bash
     run: |
-      echo "CMAKE=$GITHUB_WORKSPACE/cmake-${{ matrix.cmake_version }}-linux-x86_64/bin/cmake" >> $GITHUB_ENV
-      echo "CTEST=$GITHUB_WORKSPACE/cmake-${{ matrix.cmake_version }}-linux-x86_64/bin/ctest" >> $GITHUB_ENV
+      echo "CMAKE=$GITHUB_WORKSPACE/cmake-${{ matrix.cmake_version }}-$osarch/bin/cmake" >> $GITHUB_ENV
+      echo "CTEST=$GITHUB_WORKSPACE/cmake-${{ matrix.cmake_version }}-$osarch/bin/ctest" >> $GITHUB_ENV
 
   - name: echo CMake version
     shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19...3.30)
+cmake_minimum_required(VERSION 3.20...3.30)
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
   message(FATAL_ERROR "Please use out of source build:

diff --git a/cmake/FindSCALAPACK.cmake b/cmake/FindSCALAPACK.cmake
@@ -174,7 +174,7 @@ DOC "SCALAPACK library"
 
 # some systems have libblacs as a separate file, instead of being subsumed in libscalapack.
 if(NOT DEFINED BLACS_ROOT)
-  get_filename_component(BLACS_ROOT ${SCALAPACK_LIBRARY} DIRECTORY)
+  cmake_path(GET SCALAPACK_LIBRARY PARENT_PATH BLACS_ROOT)
 endif()
 
 find_library(BLACS_LIBRARY

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 if(WIN32)
   get_property(imp_mumps TARGET MUMPS::COMMON PROPERTY IMPORTED_LOCATION_RELEASE)
   if(imp_mumps)
-    get_filename_component(imp_mumps_dir ${imp_mumps} DIRECTORY)
+    cmake_path(GET imp_mumps PARENT_PATH imp_mumps_dir)
   endif()
   set_property(TEST ${test_names} PROPERTY
   ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${imp_mumps_dir};PATH=path_list_prepend:${CMAKE_PREFIX_PATH}/bin"

diff --git a/example/metis/CMakeLists.txt b/example/metis/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.20)
 
 project(MUMPSmetisExamples
 LANGUAGES C Fortran

diff --git a/example/scotch/CMakeLists.txt b/example/scotch/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.20)
 
 project(MUMPSscotchExamples
 LANGUAGES C Fortran

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.20)
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
   message(FATAL_ERROR "please use out of source build
@@ -105,7 +105,7 @@ if(NOT bison)
 endif()
 
 message(STATUS "Bison found: ${bison}")
-get_filename_component(bison_root ${bison} DIRECTORY)
+cmake_path(GET bison PARENT_PATH bison_root)
 
 set(BISON_ROOT ${bison_root} PARENT_SCOPE)
 

diff --git a/scripts/build_metis.cmake b/scripts/build_metis.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.20)
 
 option(intsize64 "use 64-bit integers in C and Fortran--METIS must be consistent with MUMPS")
 

diff --git a/scripts/build_scotch.cmake b/scripts/build_scotch.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.20)
 
 option(intsize64 "use 64-bit integers in C and Fortran--Scotch must be consistent with MUMPS")