From 960fb3825661dd45ec74b4e1d59d03dc9ca670ed Mon Sep 17 00:00:00 2001
From: Boris Basic <boris.basic@edf.fr>
Date: Thu, 10 Mar 2022 16:43:44 +0100
Subject: [PATCH] Update MUMPS CMake version to 5.4.1.11 (patch no longer
needed)
---
build-telemac-deps.bat | 4 +--
patches/mumps-5.4.1.patch | 52 ---------------------------------------
2 files changed, 2 insertions(+), 54 deletions(-)
delete mode 100644 patches/mumps-5.4.1.patch
diff --git a/build-telemac-deps.bat b/build-telemac-deps.bat
index f5c752e..5febe28 100644
--- a/build-telemac-deps.bat
+++ b/build-telemac-deps.bat
@@ -217,8 +217,8 @@ exit /b 0
rem *********
rem * MUMPS *
rem *********
-call :download %mumps% "https://github.com/scivision/mumps/archive/refs/tags/v5.4.1.9.zip" || exit /b 1
-set cmake_config_options=-DMUMPS_UPSTREAM_VERSION=5.4.1 -Dautobuild:BOOL=OFF -DLAPACK_ROOT:PATH=%install_path%/%lapack% -DSCALAPACK_ROOT:PATH=%install_path%/%scalapack%
+call :download %mumps% "https://github.com/scivision/mumps/archive/refs/tags/v5.4.1.11.zip" || exit /b 1
+set cmake_config_options=-DLAPACK_ROOT:PATH=%install_path%/%lapack% -DSCALAPACK_ROOT:PATH=%install_path%/%scalapack%
if %compiler% == mingw (
set cmake_config_options=%cmake_config_options% -DMPI_ROOT:PATH=%install_path%/%msmpi%
) else (
diff --git a/patches/mumps-5.4.1.patch b/patches/mumps-5.4.1.patch
deleted file mode 100644
index 602f0cc..0000000
--- a/patches/mumps-5.4.1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur mumps-5.4.1/CMakeLists.txt mumps-5.4.1-patched/CMakeLists.txt
---- mumps-5.4.1/CMakeLists.txt 2021-12-06 06:22:23.000000000 +0100
-+++ mumps-5.4.1-patched/CMakeLists.txt 2022-01-20 15:26:27.736404800 +0100
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.19...3.22)
-+cmake_minimum_required(VERSION 3.20...3.22)
-
- get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
- if(NOT is_multi_config AND NOT (CMAKE_BUILD_TYPE OR DEFINED ENV{CMAKE_BUILD_TYPE}))
-diff -ur mumps-5.4.1/cmake/PatchFile.cmake mumps-5.4.1-patched/cmake/PatchFile.cmake
---- mumps-5.4.1/cmake/PatchFile.cmake 2021-12-06 06:22:23.000000000 +0100
-+++ mumps-5.4.1-patched/cmake/PatchFile.cmake 2022-01-20 15:26:27.737403300 +0100
-@@ -7,13 +7,24 @@
- # Apply patch_file to in_file via GNU Patch.
-
- if(WIN32)
-- find_package(Msys)
-- if(MSYS_INSTALL_PATH)
-+ find_package(Git QUIET)
-+ if(Git_FOUND)
-+ cmake_path(GET GIT_EXECUTABLE PARENT_PATH GIT_CMD_PATH)
-+ cmake_path(GET GIT_CMD_PATH PARENT_PATH GIT_INSTALL_PATH)
- find_program(PATCH
- NAMES patch
-- HINTS ${MSYS_INSTALL_PATH}
-- PATH_SUFFIXES bin usr/bin
-+ HINTS ${GIT_INSTALL_PATH}
-+ PATH_SUFFIXES usr/bin
- )
-+ else()
-+ find_package(Msys QUIET)
-+ if(MSYS_INSTALL_PATH)
-+ find_program(PATCH
-+ NAMES patch
-+ HINTS ${MSYS_INSTALL_PATH}
-+ PATH_SUFFIXES bin usr/bin
-+ )
-+ endif()
- endif()
-
- if(NOT PATCH)
-diff -ur mumps-5.4.1/cmake/get_mumps.cmake mumps-5.4.1-patched/cmake/get_mumps.cmake
---- mumps-5.4.1/cmake/get_mumps.cmake 2021-12-06 06:22:23.000000000 +0100
-+++ mumps-5.4.1-patched/cmake/get_mumps.cmake 2021-12-30 16:46:13.037215500 +0100
-@@ -40,7 +40,6 @@
- URL ${mumps_urls}
- URL_HASH SHA256=${mumps_sha256}
- SOURCE_DIR ${PROJECT_SOURCE_DIR}/cache/MUMPS-${MUMPS_UPSTREAM_VERSION}-src
--SUBBUILD_DIR ${PROJECT_SOURCE_DIR}/cache/MUMPS-${MUMPS_UPSTREAM_VERSION}-subbuild
- INACTIVITY_TIMEOUT 15
- )
-
--
GitLab