Commit 5d2ea50f authored by Nicolae Rosia's avatar Nicolae Rosia Committed by Lorenz Meier
Browse files

CMakeLists.txt: use find_package to find Eigen3



CMake has a FindEigen3.cmake which can be used to find Eigen3.
Let's do it CMake-way.
Signed-off-by: default avatarNicolae Rosia <nicolae.rosia@gmail.com>
parent 12a3db8b
...@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) ...@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
find_package( PkgConfig REQUIRED) find_package( PkgConfig REQUIRED)
find_package(OpenCV REQUIRED) find_package(OpenCV REQUIRED)
find_package(gazebo REQUIRED) find_package(gazebo REQUIRED)
pkg_check_modules( EIGEN3 REQUIRED eigen3) find_package(Eigen3 REQUIRED)
pkg_check_modules( protobuf REQUIRED protobuf ) pkg_check_modules( protobuf REQUIRED protobuf )
FIND_PACKAGE( Boost 1.40 COMPONENTS system thread REQUIRED ) FIND_PACKAGE( Boost 1.40 COMPONENTS system thread REQUIRED )
...@@ -23,13 +23,11 @@ include_directories( ...@@ -23,13 +23,11 @@ include_directories(
${GAZEBO_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS}
${GAZEBO_MSG_INCLUDE_DIRS} ${GAZEBO_MSG_INCLUDE_DIRS}
${SDF_INCLUDE_DIRS} ${SDF_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR}
${OpenCV_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}/msgs ${CMAKE_CURRENT_BINARY_DIR}/msgs
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
# Hack to work around pkg_check_modules not setting the Eigen dir # Workaround for OGRE include dirs on Mac OS
${Boost_INCLUDE_DIR}/eigen3
# Hack to work around pkg_check_modules not setting the OGRE dirs correctly
/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