Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
wintel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
opentelemac
wintel
Commits
960fb382
Commit
960fb382
authored
3 years ago
by
Boris Basic
Browse files
Options
Downloads
Patches
Plain Diff
Update MUMPS CMake version to 5.4.1.11 (patch no longer needed)
parent
9abd027b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build-telemac-deps.bat
+2
-2
2 additions, 2 deletions
build-telemac-deps.bat
patches/mumps-5.4.1.patch
+0
-52
0 additions, 52 deletions
patches/mumps-5.4.1.patch
with
2 additions
and
54 deletions
build-telemac-deps.bat
+
2
−
2
View file @
960fb382
...
...
@@ -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
(
...
...
This diff is collapsed.
Click to expand it.
patches/mumps-5.4.1.patch
deleted
100644 → 0
+
0
−
52
View file @
9abd027b
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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment