From c024e5a5d8232c8576c42d4a5c059ca07a1e8127 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 23 Mar 2023 15:10:03 +0100
Subject: [PATCH] [cmake] Use proper Eigen version 3.4.0 if
OGS_USE_EIGEN_UNSUPPORTED=OFF.
---
scripts/cmake/Dependencies.cmake | 11 +++++++++--
web/data/versions.json | 3 ++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 20a16fa2fc1..4b9d088151a 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -94,13 +94,20 @@ if(_build_chemistry_lib)
endif()
endif()
+set(_eigen_version ${ogs.minimum_version.eigen})
+set(_eigen_url https://gitlab.com/libeigen/eigen/-/archive/${_eigen_version}/eigen-${_eigen_version}.tar.gz)
+if(OGS_USE_EIGEN_UNSUPPORTED)
+ set(_eigen_version 3.4.90)
+ set(_eigen_url https://gitlab.com/libeigen/eigen/-/archive/${ogs.minimum_version.eigen-unsupported}/eigen-${ogs.minimum_version.eigen-unsupported}.tar.gz)
+endif()
+
CPMFindPackage(
NAME Eigen3
# Error as in
# https://gitlab.com/gitlab-com/gl-infra/reliability/-/issues/8475
# GITLAB_REPOSITORY libeigen/eigen
- URL https://gitlab.com/libeigen/eigen/-/archive/${ogs.minimum_version.eigen}/eigen-${ogs.minimum_version.eigen}.tar.gz
- GIT_TAG ${ogs.minimum_version.eigen}
+ URL ${_eigen_url}
+ VERSION ${_eigen_version}
DOWNLOAD_ONLY YES
)
if(Eigen3_ADDED)
diff --git a/web/data/versions.json b/web/data/versions.json
index 0c459d0c234..cf6dabee4fa 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -14,7 +14,8 @@
"cmake": "3.22",
"hugo": "0.64.1",
"boost": "1.73.0",
- "eigen": "9441d94dccccd5db8d64179516fdc5b53994a047",
+ "eigen": "3.4.0",
+ "eigen-unsupported": "9441d94dccccd5db8d64179516fdc5b53994a047",
"vtk": "9.1.0",
"petsc": "3.16.3",
"qt": "5.14.2",
--
GitLab