Skip to content

Commit

Permalink
allow arbitrary MUMPS_UPSTREAM_VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed May 2, 2024
1 parent a3d1cd2 commit 29fb19f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 52 deletions.
18 changes: 17 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,23 @@ message(STATUS "MUMPS ORDERING_DEFS: ${ORDERING_DEFS}")
message(STATUS "MUMPS ORDERING_LIBS: ${ORDERING_LIBS}")

# --- download MUMPS source
include(cmake/mumps_src.cmake)
include(FetchContent)

set(url "https://mumps-solver.org/MUMPS_${MUMPS_UPSTREAM_VERSION}.tar.gz")

set(FETCHCONTENT_QUIET no)

FetchContent_Declare(${PROJECT_NAME}
SOURCE_DIR ${PROJECT_SOURCE_DIR}/mumps/${MUMPS_UPSTREAM_VERSION}
URL ${url}
TLS_VERIFY ${CMAKE_TLS_VERIFY}
)

FetchContent_GetProperties(${PROJECT_NAME})
if(NOT ${PROJECT_NAME}_POPULATED)
FetchContent_Populate(${PROJECT_NAME})
endif()

message(VERBOSE "MUMPS ${MUMPS_UPSTREAM_VERSION} source directory: ${mumps_SOURCE_DIR}")

# --- MUMPS build
Expand Down
18 changes: 0 additions & 18 deletions cmake/libraries.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,5 @@
"scotch": {
"git": "https://gitlab.inria.fr/scotch/scotch.git",
"tag": "v7.0.4"
},

"mumps_src": {
"4.8.4": "https://graal.ens-lyon.fr/MUMPS/MUMPS_4.8.4.tar.gz",
"4.9.2": "https://graal.ens-lyon.fr/MUMPS/MUMPS_4.9.2.tar.gz",
"4.10.0": "https://graal.ens-lyon.fr/MUMPS/MUMPS_4.10.0.tar.gz",
"5.0.2": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.0.2.tar.gz",
"5.1.2": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.1.2.tar.gz",
"5.2.1": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.2.1.tar.gz",
"5.3.1": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.3.1.tar.gz",
"5.3.5": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.3.5.tar.gz",
"5.4.1": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.4.1.tar.gz",
"5.5.0": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.5.0.tar.gz",
"5.5.1": "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.5.1.tar.gz",
"5.6.0": "https://mumps-solver.org/MUMPS_5.6.0.tar.gz",
"5.6.1": "https://mumps-solver.org/MUMPS_5.6.1.tar.gz",
"5.6.2": "https://mumps-solver.org/MUMPS_5.6.2.tar.gz",
"5.7.0": "https://mumps-solver.org/MUMPS_5.7.0.tar.gz"
}
}
33 changes: 0 additions & 33 deletions cmake/mumps_src.cmake

This file was deleted.

0 comments on commit 29fb19f

Please sign in to comment.