Commit e2d8a6a1 authored by Lars Bilke's avatar Lars Bilke
Browse files

Replaced eigen Conan package with CPM.

parent 8b8c8f90
Pipeline #3206 failed with stages
in 13 minutes and 29 seconds
......@@ -38,6 +38,7 @@ target_link_libraries(MathLib
${OpenMP_CXX_LIBRARIES}
$<$<TARGET_EXISTS:LAPACK::LAPACK>:LAPACK::LAPACK>
$<$<BOOL:${OGS_USE_LIS}>:${LIS_LIBRARIES}>
Eigen3
PRIVATE
spdlog::spdlog
)
......
......@@ -34,7 +34,6 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/conan/conan.cmake)
set(CONAN_REQUIRES
boost/${ogs.minimum_version.boost}@conan/stable
eigen/${ogs.minimum_version.eigen}
vtk/${ogs.tested_version.vtk}@bilke/stable
CACHE INTERNAL ""
)
......
......@@ -95,3 +95,14 @@ if (OGS_BUILD_PROCESS_ComponentTransport
include(scripts/cmake/iphreeqc.cmake)
endif()
endif()
CPMAddPackage(
NAME Eigen3
GITLAB_REPOSITORY libeigen/eigen
GIT_TAG ${ogs.minimum_version.eigen}
DOWNLOAD_ONLY YES
)
if(Eigen3_ADDED)
add_library(Eigen3 INTERFACE IMPORTED)
target_include_directories(Eigen3 INTERFACE ${Eigen3_SOURCE_DIR})
endif()
......@@ -82,13 +82,6 @@ else()
include(${VTK_USE_FILE})
endif()
if(OGS_USE_CONAN)
set(EIGEN3_INCLUDE_DIR ${CONAN_INCLUDE_DIRS_EIGEN} CACHE INTERNAL "")
else()
find_package(Eigen3 ${ogs.minimum_version.eigen} REQUIRED)
endif()
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
if(OGS_USE_MFRONT)
## pthread, is a requirement of mfront ##
set(CMAKE_THREAD_PREFER_PTHREAD ON)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment