From a3dd4b96eec6209821ae42e9828755d854c87dba Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 2 Apr 2019 13:03:44 +0200
Subject: [PATCH] [Conan] Switch to lower-case shapelib and offical eigen
package.
---
CMakeLists.txt | 2 +-
scripts/cmake/ConanSetup.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 499a9d46588..99ee0a86723 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ set(OGS_CONAN_BUILD "missing" CACHE STRING "Possible values: all, missing, \
# Third-party libraries, names come from Conan package names
set(OGS_LIBS
- VTK Boost Eigen3 Qt Shapelib libgeotiff petsc lis cvode
+ vtk boost eigen qt shapelib libgeotiff petsc lis cvode
CACHE INTERNAL "")
foreach(LIB ${OGS_LIBS})
set(OGS_LIB_${LIB} "Default" CACHE STRING "Which ${LIB} library should be used?")
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index d5f2e583eb5..c92fa491921 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -26,7 +26,7 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES
boost/1.66.0@conan/stable
- Eigen3/3.3.4@bilke/stable
+ eigen/3.3.4@conan/stable
vtk/8.2.0@bilke/stable
CACHE INTERNAL ""
)
--
GitLab