Commit 2c6cafb8 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

Eigen3 hotfix

parent 7c1ae0c6
...@@ -13,9 +13,13 @@ endif() ...@@ -13,9 +13,13 @@ endif()
find_package(Eigen3 QUIET) find_package(Eigen3 QUIET)
if(NOT EIGEN3_FOUND) if(NOT EIGEN3_FOUND)
# Fallback to cmake_modules # Fallback to cmake_modules
find_package(Eigen REQUIRED) find_package(Eigen QUIET)
set(EIGEN3_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}) if(NOT EIGEN_FOUND)
set(EIGEN3_LIBRARIES ${EIGEN_LIBRARIES}) pkg_check_modules( EIGEN3 REQUIRED eigen3)
else()
set(EIGEN3_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS})
set(EIGEN3_LIBRARIES ${EIGEN_LIBRARIES})
endif()
else() else()
set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
endif() endif()
...@@ -40,6 +44,8 @@ include_directories( ...@@ -40,6 +44,8 @@ include_directories(
${OpenCV_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}/msgs ${CMAKE_CURRENT_BINARY_DIR}/msgs
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
# Workaround for Eigen3
${Boost_INCLUDE_DIR}/eigen3
# Workaround for OGRE include dirs on Mac OS # Workaround for OGRE include dirs on Mac OS
/usr/local/include/OGRE /usr/local/include/OGRE
/usr/local/include/OGRE/Paging /usr/local/include/OGRE/Paging
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment