From dbb6db11df96f9cb6084894f02b8a1eec464165b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 2 Dec 2022 17:02:18 +0100
Subject: [PATCH] Test tfel rliv-4.0.
---
scripts/cmake/Dependencies.cmake | 3 ++-
scripts/cmake/DependenciesExternalProject.cmake | 8 +++++---
web/data/versions.json | 3 +--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 15ab0adf15f..6d6bee1edca 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -105,7 +105,8 @@ if(OGS_USE_MFRONT)
CPMAddPackage(
NAME MGIS
GITHUB_REPOSITORY ufz/MFrontGenericInterfaceSupport
- GIT_TAG 5e04da987ca421b57759e8559b3f169289abe832 # ogs-fixes branch
+ # fixes branch: rliv-2.0-ogs
+ GIT_TAG 36c886f26e3aef89d377d43bd35a66ee0415ad9f
OPTIONS "enable-doxygen-doc OFF" "enable-fortran-bindings OFF"
"enable-website OFF"
EXCLUDE_FROM_ALL YES
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
index f862c923968..4ca8a9b70b1 100644
--- a/scripts/cmake/DependenciesExternalProject.cmake
+++ b/scripts/cmake/DependenciesExternalProject.cmake
@@ -14,11 +14,13 @@ if(OGS_USE_MFRONT)
option(OGS_BUILD_TFEL
"Build TFEL locally. Needs to be set with a clean cache!" OFF
)
- set(_tfel_source GIT_REPOSITORY https://github.com/thelfer/tfel.git GIT_TAG
- ${ogs.minimum_version.tfel}
+ set(_tfel_source
+ GIT_REPOSITORY
+ https://github.com/${ogs.minimum_version.tfel-repo}/tfel.git GIT_TAG
+ rliv-${ogs.minimum_version.tfel-rliv}
)
set(_tfel_source_file
- ${OGS_EXTERNAL_DEPENDENCIES_CACHE}/tfel-${ogs.minimum_version.tfel}.zip
+ ${OGS_EXTERNAL_DEPENDENCIES_CACHE}/tfel-rliv-${ogs.minimum_version.tfel-rliv}.zip
)
if(EXISTS ${_tfel_source_file})
set(_tfel_source URL ${_tfel_source_file})
diff --git a/web/data/versions.json b/web/data/versions.json
index 8bedf5b9529..df4dd179fcc 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -22,9 +22,8 @@
"snakemake": "7.15.2",
"hdf5": "1.12.1",
"libxml2": "2.9.12",
- "tfel-rliv": "3.4",
+ "tfel-rliv": "4.0",
"tfel-repo": "thelfer",
- "tfel": "c12e865a405f0d070f6113d0da439cffa3af376d",
"lis": "1.7.37",
"gtest": "1.11.0"
},
--
GitLab