Fix Eigen search paths Fixes issue #1 on http://code.google.com/p/ceres-solver.
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a9cecc..a8a5c63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ # # Author: keir@google.com (Keir Mierle) - CMAKE_MINIMUM_REQUIRED(VERSION 2.2) IF (COMMAND cmake_policy) @@ -190,13 +189,11 @@ /usr/include /usr/include/eigen3 # Ubuntu 10.04's default location. /usr/local/include - /usr/local/include/eigen3, + /usr/local/include/eigen3 /opt/local/var/macports/software/eigen3/opt/local/include/eigen3/) -FIND_PATH(EIGEN_INCLUDE NAMES Eigen/Core PATHS - /usr/include/eigen2 - ) +FIND_PATH(EIGEN_INCLUDE NAMES Eigen/Core PATHS ${EIGEN_SEARCH_HEADERS}) IF (NOT EXISTS ${EIGEN_INCLUDE}) - MESSAGE(FATAL_ERROR "Can't find Eigen. Try passing -DEIGEN_INCLUDE=...") + MESSAGE(FATAL_ERROR "Can't find Eigen. Try passing -DEIGEN_INCLUDE=...") ENDIF (NOT EXISTS ${EIGEN_INCLUDE}) MESSAGE("-- Found Eigen 3.0: ${EIGEN_INCLUDE}") @@ -251,7 +248,6 @@ ADD_DEFINITIONS(-DCERES_HAVE_RWLOCK) ENDIF (UNIX) - # Use the std namespace for the hash<> and related templates. This may vary by # system. ADD_DEFINITIONS("\"-DCERES_HASH_NAMESPACE_START=namespace std { namespace tr1 {\"")