scalapack work with Cmake < 3.21

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

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ on:
       - "**.cmake"
       - "**.cmake.in"
       - "**.txt"
+      - "cmake/libraries.json"
       - ".github/workflows/ci.yml"
       - "!scripts/*"
 
@@ -85,7 +86,7 @@ jobs:
     - uses: ./.github/workflows/composite-cmake
 
     - name: configure
-      run: $CMAKE -Bbuild
+      run: $CMAKE -Bbuild -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/build/local
 
     - name: build
       run: $CMAKE --build build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 
 project(MUMPS
 LANGUAGES C Fortran
-VERSION 5.7.3.0
+VERSION 5.7.3.1
 DESCRIPTION "Sparse direct parallel solver"
 HOMEPAGE_URL "http://mumps-solver.org/"
 )

diff --git a/cmake/libraries.json b/cmake/libraries.json
@@ -4,7 +4,7 @@
   },
   "scalapack": {
     "git": "https://github.com/scivision/scalapack.git",
-    "tag": "e5aa3622e020225d66b45fe5ed1b2273ca6f0cfb"
+    "tag": "e5b11f8ac7b5c6e0bab6fabe7e5ac8602ecab425"
   },
   "metis": {
     "git": "https://github.com/scivision/METIS.git",

diff --git a/cmake/scalapack.cmake b/cmake/scalapack.cmake
@@ -1,7 +1,7 @@
 include(ExternalProject)
 include(GNUInstallDirs)
 
-if(find)
+if(find AND NOT TARGET SCALAPACK::SCALAPACK)
 
 if(NOT DEFINED SCALAPACK_VENDOR)
   if(LAPACK_VENDOR MATCHES "^MKL")
@@ -27,7 +27,7 @@ find_package(SCALAPACK COMPONENTS ${SCALAPACK_VENDOR})
 
 endif()
 
-if(SCALAPACK_FOUND)
+if(SCALAPACK_FOUND OR TARGET SCALAPACK::SCALAPACK)
   return()
 endif()