diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-11-20 10:17:59 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-11-20 10:17:59 -0500 |
| commit | 3c5e32f0daa3a73394f9b770ef6cba82c47f033e (patch) | |
| tree | c35f9aee2718015c8e6ab641ba64a0f92cab3ab3 /cmake/FindEigen2.cmake | |
| parent | 34be9d45376193cf1d1cdbcb6d96fbc4f0af73b9 (diff) | |
improvements in FindEigen*.cmake, ported from changes in CMakeLists.txt:
- better regular expression
- grep the whole file, not expensive anyway, more robust
Diffstat (limited to 'cmake/FindEigen2.cmake')
| -rw-r--r-- | cmake/FindEigen2.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/FindEigen2.cmake b/cmake/FindEigen2.cmake index ee054b0da..da95bb0f5 100644 --- a/cmake/FindEigen2.cmake +++ b/cmake/FindEigen2.cmake @@ -29,13 +29,13 @@ if(NOT Eigen2_FIND_VERSION) endif(NOT Eigen2_FIND_VERSION) macro(_eigen2_check_version) - file(READ "${EIGEN2_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen2_version_header LIMIT 5000 OFFSET 1000) + file(READ "${EIGEN2_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen2_version_header) - string(REGEX MATCH "define *EIGEN_WORLD_VERSION ([0-9]*)" _eigen2_world_version_match "${_eigen2_version_header}") + string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen2_world_version_match "${_eigen2_version_header}") set(EIGEN2_WORLD_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define *EIGEN_MAJOR_VERSION ([0-9]*)" _eigen2_major_version_match "${_eigen2_version_header}") + string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen2_major_version_match "${_eigen2_version_header}") set(EIGEN2_MAJOR_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define *EIGEN_MINOR_VERSION ([0-9]*)" _eigen2_minor_version_match "${_eigen2_version_header}") + string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen2_minor_version_match "${_eigen2_version_header}") set(EIGEN2_MINOR_VERSION "${CMAKE_MATCH_1}") set(EIGEN2_VERSION ${EIGEN2_WORLD_VERSION}.${EIGEN2_MAJOR_VERSION}.${EIGEN2_MINOR_VERSION}) |