From f633ec77009f2063c4c031c0fcf120e67a00792a Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 14 Dec 2018 16:41:08 +0100
Subject: [PATCH] Require Eigen-3.3.4.
Related to c++17 removed binder* functions.
Fixed in http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1276
http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.2.10
Other binder* functions were removed only in the 3.3 branch.
---
scripts/cmake/ConanSetup.cmake | 2 +-
scripts/cmake/Find.cmake | 4 ++--
scripts/env/envinf1/cli.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 60b03bb5983..0095afd3a79 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_optional/1.66.0@bincrafters/stable
boost_property_tree/1.66.0@bincrafters/stable
- Eigen3/3.2.9@bilke/stable
+ Eigen3/3.3.4@bilke/stable
VTK/8.1.1@bilke/stable
CACHE INTERNAL ""
)
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index c26e440319e..a2086a41132 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -55,7 +55,7 @@ find_program(PIP pip)
find_program(PANDOC_CITEPROC pandoc-citeproc)
find_program(MODULE_CMD modulecmd
- PATHS /usr/local/modules/3.2.10-1/Modules/3.2.10/bin)
+ PATHS /usr/local/modules/3.3.4-1/Modules/3.3.4/bin)
######################
### Find libraries ###
@@ -68,7 +68,7 @@ endif()
find_package(VTK 8.1.0 REQUIRED)
include(${VTK_USE_FILE})
-find_package(Eigen3 3.2.9 REQUIRED)
+find_package(Eigen3 3.3.4 REQUIRED)
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
## pthread, is a requirement of logog ##
diff --git a/scripts/env/envinf1/cli.sh b/scripts/env/envinf1/cli.sh
index 1003a3525e3..e79a200418f 100644
--- a/scripts/env/envinf1/cli.sh
+++ b/scripts/env/envinf1/cli.sh
@@ -7,7 +7,7 @@ module load git
# Libraries
module load boost/1.62.0-1
-module load eigen/3.2.9-1-cmake
+module load eigen/3.3.4-1-cmake
module load vtk/8.1.1_gcc-6.2.0_openmpi-1.8.8
# Tools
--
GitLab