forked from OpenChemistry/avogadrolibs
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Modernize Eigen3 use as an imported target
Eigen3 is a header only template library, adopt an updated FindEigen.cmake that creates an imported target. Note that include directories from imported targets are automatically treated as system includes on compilers that support the concept. The core header only Avogadro library exposes it as part of its interface, and then we are able to remove a huge amount of duplicated code. Still need to look at the other side to ensure the exported targets find all targets like Eigen they depend upon. Signed-off-by: Marcus D. Hanwell <[email protected]>
- Loading branch information
Showing
13 changed files
with
37 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,80 +1,33 @@ | ||
| # - Try to find Eigen3 lib | ||
| # | ||
| # This module supports requiring a minimum version, e.g. you can do | ||
| # find_package(Eigen3 3.1.2) | ||
| # to require version 3.1.2 or newer of Eigen3. | ||
| # | ||
| # Once done this will define | ||
| # | ||
| # EIGEN3_FOUND - system has eigen lib with correct version | ||
| # EIGEN3_INCLUDE_DIR - the eigen include directory | ||
| # EIGEN3_VERSION - eigen version | ||
|
|
||
| # Copyright (c) 2006, 2007 Montel Laurent, <[email protected]> | ||
| # Copyright (c) 2008, 2009 Gael Guennebaud, <[email protected]> | ||
| # Copyright (c) 2009 Benoit Jacob <[email protected]> | ||
| # Redistribution and use is allowed according to the terms of the 2-clause BSD license. | ||
|
|
||
| if(NOT Eigen3_FIND_VERSION) | ||
| if(NOT Eigen3_FIND_VERSION_MAJOR) | ||
| set(Eigen3_FIND_VERSION_MAJOR 2) | ||
| endif(NOT Eigen3_FIND_VERSION_MAJOR) | ||
| if(NOT Eigen3_FIND_VERSION_MINOR) | ||
| set(Eigen3_FIND_VERSION_MINOR 91) | ||
| endif(NOT Eigen3_FIND_VERSION_MINOR) | ||
| if(NOT Eigen3_FIND_VERSION_PATCH) | ||
| set(Eigen3_FIND_VERSION_PATCH 0) | ||
| endif(NOT Eigen3_FIND_VERSION_PATCH) | ||
|
|
||
| set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") | ||
| endif(NOT Eigen3_FIND_VERSION) | ||
|
|
||
| macro(_eigen3_check_version) | ||
| file(READ "${EIGEN3_INCLUDE_DIR}/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}") | ||
| string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}") | ||
| set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}") | ||
| string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}") | ||
| set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}") | ||
|
|
||
| set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) | ||
| if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) | ||
| set(EIGEN3_VERSION_OK FALSE) | ||
| else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) | ||
| set(EIGEN3_VERSION_OK TRUE) | ||
| endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) | ||
|
|
||
| if(NOT EIGEN3_VERSION_OK) | ||
|
|
||
| message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " | ||
| "but at least version ${Eigen3_FIND_VERSION} is required") | ||
| endif(NOT EIGEN3_VERSION_OK) | ||
| endmacro(_eigen3_check_version) | ||
|
|
||
| if (EIGEN3_INCLUDE_DIR) | ||
|
|
||
| # in cache already | ||
| _eigen3_check_version() | ||
| set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) | ||
|
|
||
| else (EIGEN3_INCLUDE_DIR) | ||
|
|
||
| find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library | ||
| PATHS | ||
| ${CMAKE_INSTALL_PREFIX}/include | ||
| ${KDE4_INCLUDE_DIR} | ||
| PATH_SUFFIXES eigen3 eigen | ||
| ) | ||
|
|
||
| if(EIGEN3_INCLUDE_DIR) | ||
| _eigen3_check_version() | ||
| endif(EIGEN3_INCLUDE_DIR) | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) | ||
|
|
||
| mark_as_advanced(EIGEN3_INCLUDE_DIR) | ||
|
|
||
| endif(EIGEN3_INCLUDE_DIR) | ||
| find_path(Eigen3_INCLUDE_DIR | ||
| NAMES signature_of_eigen3_matrix_library | ||
| PATH_SUFFIXES eigen3 eigen | ||
| DOC "Eigen include directory") | ||
| mark_as_advanced(Eigen3_INCLUDE_DIR) | ||
|
|
||
| if (Eigen3_INCLUDE_DIR) | ||
| file(STRINGS "${Eigen3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _Eigen3_version_lines | ||
| REGEX "#define[ \t]+EIGEN_(WORLD|MAJOR|MINOR)_VERSION") | ||
| string(REGEX REPLACE ".*EIGEN_WORLD_VERSION *\([0-9]*\).*" "\\1" _Eigen3_version_world "${_Eigen3_version_lines}") | ||
| string(REGEX REPLACE ".*EIGEN_MAJOR_VERSION *\([0-9]*\).*" "\\1" _Eigen3_version_major "${_Eigen3_version_lines}") | ||
| string(REGEX REPLACE ".*EIGEN_MINOR_VERSION *\([0-9]*\).*" "\\1" _Eigen3_version_minor "${_Eigen3_version_lines}") | ||
| set(Eigen3_VERSION "${_Eigen3_version_world}.${_Eigen3_version_major}.${_Eigen3_version_minor}") | ||
| unset(_Eigen3_version_world) | ||
| unset(_Eigen3_version_major) | ||
| unset(_Eigen3_version_minor) | ||
| unset(_Eigen3_version_lines) | ||
| endif () | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Eigen3 | ||
| REQUIRED_VARS Eigen3_INCLUDE_DIR | ||
| VERSION_VAR Eigen3_VERSION) | ||
|
|
||
| if (Eigen3_FOUND) | ||
| set(Eigen3_INCLUDE_DIRS "${Eigen3_INCLUDE_DIR}") | ||
|
|
||
| if (NOT TARGET Eigen3::Eigen3) | ||
| add_library(Eigen3::Eigen3 INTERFACE IMPORTED) | ||
| set_target_properties(Eigen3::Eigen3 PROPERTIES | ||
| INTERFACE_INCLUDE_DIRECTORIES "${Eigen3_INCLUDE_DIR}") | ||
| endif () | ||
| endif () |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters