From 015b846315a032ce49dd87b06b5c0591fc057a94 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 21 Dec 2020 20:58:07 +0100
Subject: [PATCH] Bumped minimum eigen to 3.3.9.
Fixes compile errors with gcc 10.
---
ThirdParty/container-maker | 2 +-
scripts/cmake/ConanSetup.cmake | 2 +-
web/data/versions.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 3ab69e4fe4b..e4dea7028f1 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 3ab69e4fe4b431aa2850f5a99fe9c4c4882a6dfa
+Subproject commit e4dea7028f1969e9942b680b9eda951a8432e9a3
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index bec3c0476b4..4bc698c0f97 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -33,7 +33,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES
boost/${ogs.minimum_version.boost}@conan/stable
- eigen/${ogs.minimum_version.eigen}@conan/stable
+ eigen/${ogs.minimum_version.eigen}
vtk/${ogs.tested_version.vtk}@bilke/stable
CACHE INTERNAL ""
)
diff --git a/web/data/versions.json b/web/data/versions.json
index 7a59a02b10a..1dc762723e6 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -14,7 +14,7 @@
"cmake": "3.14",
"hugo": "0.64.1",
"boost": "1.67.0",
- "eigen": "3.3.4",
+ "eigen": "3.3.9",
"vtk": "8.1.2",
"petsc": "3.11.2",
"qt": "5.12.4",
--
GitLab