diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d27cee9fd9739701fd772a55c4dc89e8115692d..4e83d047a40c7b11079dcbc9d35df8d2a13960e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,7 @@ if(USE_CONAN) message(STATUS "Using conan package manager") set(OGS_LIB_VTK System CACHE INTERNAL "") set(OGS_LIB_BOOST System CACHE INTERNAL "") + set(OGS_LIB_EIGEN System CACHE INTERNAL "") endif() ### CMake includes ### diff --git a/conanfile.txt b/conanfile.txt index 988cd28178c5cf974092a986c0200603d7c33771..7ca75b694d9f8c302598a0042ab83f631506f452 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -2,6 +2,7 @@ Boost/1.60.0@lasote/stable Shapelib/1.3.0@bilke/stable VTK/7.0.0@bilke/stable +Eigen3/3.2.8@bilke/stable [generators] cmake diff --git a/scripts/cmake/ExternalProjectEigen.cmake b/scripts/cmake/ExternalProjectEigen.cmake index 258269a83c804f2a4fbfdac3acdaa5929c089086..973549edac5153aeab9effd208f079942ec469ac 100644 --- a/scripts/cmake/ExternalProjectEigen.cmake +++ b/scripts/cmake/ExternalProjectEigen.cmake @@ -1,3 +1,9 @@ +if(USE_CONAN) + find_package(Eigen3 REQUIRED) + include_directories(SYSTEM ${CONAN_INCLUDE_DIRS_EIGEN3}) + return() +endif() + if(OGS_LIB_EIGEN STREQUAL "System") find_package(Eigen3 3.2.5 REQUIRED) if(NOT EIGEN3_FOUND)