Skip to content

Commit 34ce2ec

Browse files
Merge pull request #2592 from wtabib/fix-2393
Fix #2393 Wrong Eigen found from FindEigen.cmake
2 parents f38c3cf + 3537261 commit 34ce2ec

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

cmake/Modules/FindEigen.cmake

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,8 @@ find_package(PkgConfig QUIET)
1111
pkg_check_modules(PC_EIGEN eigen3)
1212
set(EIGEN_DEFINITIONS ${PC_EIGEN_CFLAGS_OTHER})
1313

14-
if(CMAKE_SYSTEM_NAME STREQUAL Linux)
15-
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr /usr/local)
16-
endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
17-
if(APPLE)
18-
list(APPEND CMAKE_INCLUDE_PATH /opt/local)
19-
set(CMAKE_FIND_FRAMEWORK NEVER)
20-
endif()
21-
2214
find_path(EIGEN_INCLUDE_DIR Eigen/Core
23-
HINTS ${PC_EIGEN_INCLUDEDIR} ${PC_EIGEN_INCLUDE_DIRS} "${EIGEN_ROOT}" "$ENV{EIGEN_ROOT}"
15+
HINTS "${EIGEN_ROOT}" "$ENV{EIGEN_ROOT}" ${PC_EIGEN_INCLUDEDIR} ${PC_EIGEN_INCLUDE_DIRS}
2416
PATHS "$ENV{PROGRAMFILES}/Eigen" "$ENV{PROGRAMW6432}/Eigen"
2517
"$ENV{PROGRAMFILES}/Eigen3" "$ENV{PROGRAMW6432}/Eigen3"
2618
PATH_SUFFIXES eigen3 include/eigen3 include)
@@ -38,7 +30,6 @@ if(EIGEN_INCLUDE_DIR)
3830
endif(EIGEN_INCLUDE_DIR)
3931

4032
set(EIGEN_INCLUDE_DIRS ${EIGEN_INCLUDE_DIR})
41-
set(CMAKE_FIND_FRAMEWORK)
4233

4334
include(FindPackageHandleStandardArgs)
4435
find_package_handle_standard_args(Eigen DEFAULT_MSG EIGEN_INCLUDE_DIR)

0 commit comments

Comments
 (0)