Merge pull request #2592 from wtabib/fix-2393

Fix #2393 Wrong Eigen found from FindEigen.cmake
PointCloudLibrary · Nov 7, 2018 · 34ce2ec · 34ce2ec
2 parents f38c3cf + 3537261
commit 34ce2ec
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/cmake/Modules/FindEigen.cmake b/cmake/Modules/FindEigen.cmake
@@ -11,16 +11,8 @@ find_package(PkgConfig QUIET)
 pkg_check_modules(PC_EIGEN eigen3)
 set(EIGEN_DEFINITIONS ${PC_EIGEN_CFLAGS_OTHER})
 
-if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-    set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr /usr/local)
-endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
-if(APPLE)
-  list(APPEND CMAKE_INCLUDE_PATH /opt/local)
-  set(CMAKE_FIND_FRAMEWORK NEVER)
-endif()
-
 find_path(EIGEN_INCLUDE_DIR Eigen/Core
-    HINTS ${PC_EIGEN_INCLUDEDIR} ${PC_EIGEN_INCLUDE_DIRS} "${EIGEN_ROOT}" "$ENV{EIGEN_ROOT}"
+    HINTS "${EIGEN_ROOT}" "$ENV{EIGEN_ROOT}" ${PC_EIGEN_INCLUDEDIR} ${PC_EIGEN_INCLUDE_DIRS}
     PATHS "$ENV{PROGRAMFILES}/Eigen" "$ENV{PROGRAMW6432}/Eigen"
           "$ENV{PROGRAMFILES}/Eigen3" "$ENV{PROGRAMW6432}/Eigen3"
     PATH_SUFFIXES eigen3 include/eigen3 include)
@@ -38,7 +30,6 @@ if(EIGEN_INCLUDE_DIR)
 endif(EIGEN_INCLUDE_DIR)
 
 set(EIGEN_INCLUDE_DIRS ${EIGEN_INCLUDE_DIR})
-set(CMAKE_FIND_FRAMEWORK)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Eigen DEFAULT_MSG EIGEN_INCLUDE_DIR)