OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into optional-umfpack

Browse Source 
Conflicts:
	CMakeLists.txt

Import akva2's modified Eigen support.
This commit is contained in:
Bård Skaflestad 2013-07-09 13:50:45 +02:00
commit b54df706a9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -29,9 +29,7 @@ set (${project}_DEPS
dune-istl REQUIRED; dune-istl REQUIRED;
opm-core REQUIRED" opm-core REQUIRED"
# Eigen # Eigen
"Eigen3 3.1 REQUIRED" "Eigen3 3.1"
# Tim Davis' SuiteSparse package
"SuiteSparse COMPONENTS umfpack"
) )
# Additional search modules # Additional search modules
@ -164,6 +162,17 @@ execute_process (COMMAND
include (OpmCompile) include (OpmCompile)
opm_compile (${project}) opm_compile (${project})
if (NOT EIGEN3_FOUND)
message(STATUS "Downloading Eigen3")
include(ExternalProject)
externalProject_Add(Eigen3
GIT_REPOSITORY git://github.com/OPM/eigen3
CMAKE_ARGS -DEIGEN_TEST_NO_OPENGL=1 -DEIGEN_BUILD_PKGCONFIG=0 -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/eigen3-installed)
include_directories(${CMAKE_BINARY_DIR}/eigen3-installed/include/eigen3)
add_dependencies(opmautodiff Eigen3)
endif (NOT EIGEN3_FOUND)
# Installation target: copy the library together with debug and # Installation target: copy the library together with debug and
# configuration files to system directories # configuration files to system directories
include (OpmInstall) include (OpmInstall)