mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #11 from rolk/011_eigen
Set path to Eigen3 directory with -DEIGEN3_ROOT=
This commit is contained in:
commit
f044d5189a
@ -29,7 +29,7 @@ set (${project}_DEPS
|
|||||||
dune-istl REQUIRED;
|
dune-istl REQUIRED;
|
||||||
opm-core REQUIRED"
|
opm-core REQUIRED"
|
||||||
# Eigen
|
# Eigen
|
||||||
"Eigen3 REQUIRED"
|
"Eigen3 3.1 REQUIRED"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Additional search modules
|
# Additional search modules
|
||||||
|
@ -53,20 +53,33 @@ macro(_eigen3_check_version)
|
|||||||
endif(NOT EIGEN3_VERSION_OK)
|
endif(NOT EIGEN3_VERSION_OK)
|
||||||
endmacro(_eigen3_check_version)
|
endmacro(_eigen3_check_version)
|
||||||
|
|
||||||
if (EIGEN3_INCLUDE_DIR)
|
# only probe if we haven't a path in our cache
|
||||||
|
if (NOT EIGEN3_INCLUDE_DIR)
|
||||||
|
|
||||||
# in cache already
|
# allow Eigen3_ROOT to be used in addition to EIGEN3_ROOT
|
||||||
_eigen3_check_version()
|
if (Eigen3_ROOT)
|
||||||
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
|
set (EIGEN3_ROOT "${Eigen3_ROOT}")
|
||||||
|
endif (Eigen3_ROOT)
|
||||||
else (EIGEN3_INCLUDE_DIR)
|
|
||||||
|
|
||||||
|
# if the _ROOT is specified, then look *only* there; don't allow any
|
||||||
|
# other version to be swapped in to substitute; if not specified, then
|
||||||
|
# go search usual locations
|
||||||
|
if (EIGEN3_ROOT)
|
||||||
|
find_path (EIGEN3_INCLUDE_DIR
|
||||||
|
NAMES signature_of_eigen3_matrix_library
|
||||||
|
PATHS ${EIGEN3_ROOT}
|
||||||
|
PATH_SUFFIXES eigen3 include/eigen3 eigen include/eigen
|
||||||
|
NO_DEFAULT_PATH
|
||||||
|
)
|
||||||
|
else (EIGEN3_ROOT)
|
||||||
find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
|
find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
|
||||||
PATHS
|
PATHS
|
||||||
${CMAKE_INSTALL_PREFIX}/include
|
${CMAKE_INSTALL_PREFIX}/include
|
||||||
${KDE4_INCLUDE_DIR}
|
${KDE4_INCLUDE_DIR}
|
||||||
PATH_SUFFIXES eigen3 eigen
|
PATH_SUFFIXES eigen3 eigen
|
||||||
)
|
)
|
||||||
|
endif (EIGEN3_ROOT)
|
||||||
|
endif (NOT EIGEN3_INCLUDE_DIR)
|
||||||
|
|
||||||
if(EIGEN3_INCLUDE_DIR)
|
if(EIGEN3_INCLUDE_DIR)
|
||||||
_eigen3_check_version()
|
_eigen3_check_version()
|
||||||
@ -77,5 +90,4 @@ else (EIGEN3_INCLUDE_DIR)
|
|||||||
|
|
||||||
mark_as_advanced(EIGEN3_INCLUDE_DIR)
|
mark_as_advanced(EIGEN3_INCLUDE_DIR)
|
||||||
|
|
||||||
endif(EIGEN3_INCLUDE_DIR)
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user