From 2999c57e8659abc070457c511434094b49460ed5 Mon Sep 17 00:00:00 2001
From: scivision <scivision@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:26:54 -0400
Subject: [PATCH] scalapack 2.2.1.6

---
 cmake/libraries.json  | 4 ++--
 cmake/scalapack.cmake | 5 +++++
 options.cmake         | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cmake/libraries.json b/cmake/libraries.json
index a436ebf..7897033 100644
--- a/cmake/libraries.json
+++ b/cmake/libraries.json
@@ -5,7 +5,7 @@
   },
   "scalapack": {
     "git": "https://github.com/scivision/scalapack.git",
-    "tag": "v2.2.1.5"
+    "tag": "v2.2.1.6"
   },
   "metis": {
     "git": "https://github.com/scivision/METIS.git",
@@ -13,7 +13,7 @@
   },
   "scotch": {
     "git": "https://gitlab.inria.fr/scotch/scotch.git",
-    "tag": "v7.0.3"
+    "tag": "v7.0.4"
   },
 
   "mumps_src": {
diff --git a/cmake/scalapack.cmake b/cmake/scalapack.cmake
index 44b14f0..7ef6489 100644
--- a/cmake/scalapack.cmake
+++ b/cmake/scalapack.cmake
@@ -1,6 +1,8 @@
 include(ExternalProject)
 include(GNUInstallDirs)
 
+if(find)
+
 if(NOT DEFINED SCALAPACK_VENDOR AND DEFINED ENV{MKLROOT})
   set(SCALAPACK_VENDOR MKL)
 endif()
@@ -17,6 +19,8 @@ endif()
 
 find_package(SCALAPACK COMPONENTS ${SCALAPACK_VENDOR})
 
+endif()
+
 if(SCALAPACK_FOUND)
   return()
 endif()
@@ -60,6 +64,7 @@ GIT_REPOSITORY ${scalapack_url}
 GIT_TAG ${scalapack_tag}
 GIT_SHALLOW true
 CMAKE_ARGS ${scalapack_cmake_args}
+TEST_COMMAND ""
 INACTIVITY_TIMEOUT 60
 BUILD_BYPRODUCTS ${SCALAPACK_LIBRARIES}
 CONFIGURE_HANDLED_BY_BUILD true
diff --git a/options.cmake b/options.cmake
index a0f4bd4..add0394 100644
--- a/options.cmake
+++ b/options.cmake
@@ -1,5 +1,3 @@
-include(GNUInstallDirs)
-
 option(find_static "Find static libraries for Lapack and Scalapack (default shared then static search)")
 
 if(local)
@@ -35,6 +33,8 @@ if((matlab OR octave) AND parallel)
   message(FATAL_ERROR "Matlab / Octave requires parallel=off")
 endif()
 
+option(find "find [SCA]LAPACK" on)
+
 option(BUILD_SHARED_LIBS "Build shared libraries")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -49,6 +49,8 @@ option(BUILD_COMPLEX16 "Build double precision complex")
 
 option(CMAKE_TLS_VERIFY "Verify TLS certificates" ON)
 
+set_property(DIRECTORY PROPERTY EP_UPDATE_DISCONNECTED true)
+
 set(FETCHCONTENT_UPDATES_DISCONNECTED true)
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)