Skip to content
This repository has been archived by the owner on Nov 13, 2017. It is now read-only.

[reopen] Upgrade to Eigen3 as required in Jade #293

Merged
merged 3 commits into from
May 18, 2016
Merged

[reopen] Upgrade to Eigen3 as required in Jade #293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09dc3f7
Upgrade to Eigen3 as required in Jade
davetcoleman Apr 28, 2016
c34d5a6
More Eigen3 hack.
130s Apr 29, 2016
69e12f9
fixed Eigen3 variable names?
rhaschke May 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,27 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
endif()

find_package(Boost REQUIRED system filesystem date_time thread iostreams)
find_package(catkin REQUIRED
find_package(catkin REQUIRED
COMPONENTS
moveit_msgs
resource_retriever
srdfdom
kdl_parser
geometric_shapes
eigen_stl_containers
eigen_stl_containers
eigen_conversions
random_numbers
visualization_msgs
roslib
rostime
cmake_modules
)
find_package(console_bridge REQUIRED)
find_package(Eigen REQUIRED)
find_package(octomap REQUIRED)
find_package(urdfdom REQUIRED)
find_package(urdfdom_headers REQUIRED)

find_package(PkgConfig REQUIRED)
pkg_search_module(EIGEN3 REQUIRED eigen3)
pkg_check_modules(LIBFCL REQUIRED fcl)
find_library(LIBFCL_LIBRARIES_FULL ${LIBFCL_LIBRARIES} ${LIBFCL_LIBRARY_DIRS})
set(LIBFCL_LIBRARIES "${LIBFCL_LIBRARIES_FULL}")
Expand Down Expand Up @@ -64,6 +63,7 @@ set(THIS_PACKAGE_INCLUDE_DIRS

catkin_package(
INCLUDE_DIRS
${EIGEN3_INCLUDE_DIRS}
${THIS_PACKAGE_INCLUDE_DIRS}
${OCTOMAP_INCLUDE_DIRS}
LIBRARIES
Expand Down Expand Up @@ -97,22 +97,21 @@ catkin_package(
srdfdom
DEPENDS
Boost
Eigen
urdfdom
urdfdom_headers
console_bridge
)

include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIR}
${LIBFCL_INCLUDE_DIRS}
)

include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${console_bridge_INCLUDE_DIRS}
${urdfdom_INCLUDE_DIRS}
${urdfdom_headers_INCLUDE_DIRS}
include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${console_bridge_INCLUDE_DIRS}
${urdfdom_INCLUDE_DIRS}
${urdfdom_headers_INCLUDE_DIRS}
${OCTOMAP_INCLUDE_DIRS}
)

Expand Down