Now Eigen is found properly.

This commit is contained in:
Atgeirr Flø Rasmussen 2013-05-16 10:49:05 +02:00
parent db95420b98
commit d59363d681
2 changed files with 13 additions and 11 deletions

View File

@ -28,6 +28,8 @@ set (${project}_DEPS
"dune-common REQUIRED;
dune-istl REQUIRED;
opm-core REQUIRED"
# Eigen
"Eigen3 REQUIRED"
)
# Additional search modules

View File

@ -7,7 +7,7 @@
# Once done this will define
#
# EIGEN3_FOUND - system has eigen lib with correct version
# EIGEN3_INCLUDE_DIR - the eigen include directory
# EIGEN3_INCLUDE_DIRS - the eigen include directory
# EIGEN3_VERSION - eigen version
# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
@ -30,7 +30,7 @@ if(NOT Eigen3_FIND_VERSION)
endif(NOT Eigen3_FIND_VERSION)
macro(_eigen3_check_version)
file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
file(READ "${EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
@ -48,34 +48,34 @@ macro(_eigen3_check_version)
if(NOT EIGEN3_VERSION_OK)
message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIRS}, "
"but at least version ${Eigen3_FIND_VERSION} is required")
endif(NOT EIGEN3_VERSION_OK)
endmacro(_eigen3_check_version)
if (EIGEN3_INCLUDE_DIR)
if (EIGEN3_INCLUDE_DIRS)
# in cache already
_eigen3_check_version()
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
else (EIGEN3_INCLUDE_DIR)
else (EIGEN3_INCLUDE_DIRS)
find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
find_path(EIGEN3_INCLUDE_DIRS NAMES signature_of_eigen3_matrix_library
PATHS
${CMAKE_INSTALL_PREFIX}/include
${KDE4_INCLUDE_DIR}
PATH_SUFFIXES eigen3 eigen
)
if(EIGEN3_INCLUDE_DIR)
if(EIGEN3_INCLUDE_DIRS)
_eigen3_check_version()
endif(EIGEN3_INCLUDE_DIR)
endif(EIGEN3_INCLUDE_DIRS)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIRS EIGEN3_VERSION_OK)
mark_as_advanced(EIGEN3_INCLUDE_DIR)
mark_as_advanced(EIGEN3_INCLUDE_DIRS)
endif(EIGEN3_INCLUDE_DIR)
endif(EIGEN3_INCLUDE_DIRS)