Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[jade] address gcc6 build error #458

Merged
merged 2 commits into from
Mar 12, 2017
Merged

[jade] address gcc6 build error #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
966c4bd
address gcc6 build error
Jan 24, 2017
154f016
moveit_ros/planning package doesn't really depend on Qt4
Jan 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion moveit_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ catkin_package(
)

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

include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
${VERSION_FILE_PATH}
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${console_bridge_INCLUDE_DIRS}
${urdfdom_INCLUDE_DIRS}
Expand Down
2 changes: 1 addition & 1 deletion moveit_experimental/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ catkin_package(
)

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

include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${console_bridge_INCLUDE_DIRS}
${urdfdom_INCLUDE_DIRS}
Expand Down
2 changes: 1 addition & 1 deletion moveit_kinematics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ catkin_package(
)

include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
)
include_directories(SYSTEM
${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)

link_directories(${Boost_LIBRARY_DIRS})
Expand Down
4 changes: 1 addition & 3 deletions moveit_planners/ompl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ catkin_package(
moveit_core
)

include_directories(SYSTEM
${Boost_INCLUDE_DIRS})

include_directories(ompl_interface/include
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
${OMPL_INCLUDE_DIRS})

Expand Down
2 changes: 1 addition & 1 deletion moveit_plugins/moveit_controller_manager_example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
endif()

find_package(Boost REQUIRED thread)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

find_package(catkin COMPONENTS
Expand Down
2 changes: 1 addition & 1 deletion moveit_plugins/moveit_fake_controller_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
endif()

find_package(Boost REQUIRED thread)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

find_package(catkin COMPONENTS
Expand Down
2 changes: 1 addition & 1 deletion moveit_plugins/moveit_simple_controller_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
endif()

find_package(Boost REQUIRED thread)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

find_package(catkin COMPONENTS
Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ catkin_package(
include_directories(benchmarks/include)

include_directories(${catkin_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
include_directories(${Boost_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${catkin_LIBRARY_DIRS})
Expand Down
11 changes: 6 additions & 5 deletions moveit_ros/benchmarks_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
rosconsole
)

pkg_search_module(EIGEN3 REQUIRED eigen3)
pkg_search_module(EIGEN3 REQUIRED eigen3)

if(rviz_QT_VERSION VERSION_LESS "5")
find_package(Qt4 ${rviz_QT_VERSION} REQUIRED QtCore QtGui)
Expand All @@ -46,14 +46,15 @@ set(CMAKE_AUTOMOC ON)
add_definitions(-DQT_NO_KEYWORDS)

catkin_package(
INCLUDE_DIRS
${EIGEN3_INCLUDE_DIRS}
INCLUDE_DIRS
${EIGEN3_INCLUDE_DIRS}
)

include_directories(include)

include_directories(${catkin_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS})
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS})
include_directories(${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${catkin_LIBRARY_DIRS})

Expand Down
6 changes: 3 additions & 3 deletions moveit_ros/manipulation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ catkin_package(
include_directories(pick_place/include)
include_directories(move_group_pick_place_capability/include)

include_directories(${catkin_INCLUDE_DIRS})
include_directories(SYSTEM
${EIGEN3_INCLUDE_DIRS}
include_directories(${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS})
include_directories(SYSTEM
${EIGEN3_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${catkin_LIBRARY_DIRS})
Expand Down
6 changes: 2 additions & 4 deletions moveit_ros/move_group/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ catkin_package(
)

include_directories(include)
include_directories(${catkin_INCLUDE_DIRS})
include_directories(SYSTEM
${Boost_INCLUDE_DIRS}
)
include_directories(${catkin_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${catkin_LIBRARY_DIRS})
Expand Down
8 changes: 4 additions & 4 deletions moveit_ros/perception/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ find_package(catkin REQUIRED COMPONENTS
moveit_msgs
)
find_package(PkgConfig REQUIRED)
pkg_search_module(EIGEN3 REQUIRED eigen3)
pkg_search_module(EIGEN3 REQUIRED eigen3)

find_package(OpenMP)
find_package(octomap REQUIRED)
Expand All @@ -49,7 +49,7 @@ catkin_package(
occupancy_map_monitor/include
pointcloud_octomap_updater/include
semantic_world/include
${EIGEN3_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
${OCTOMAP_INCLUDE_DIRS}
LIBRARIES
moveit_lazy_free_space_updater
Expand All @@ -70,12 +70,12 @@ include_directories(mesh_filter/include
occupancy_map_monitor/include
pointcloud_octomap_updater/include
semantic_world/include
${OpenCV_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
)
include_directories(SYSTEM
${OpenCV_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${GLEW_INCLUDE_DIR}
${GLUT_INCLUDE_DIR}
${X11_INCLUDE_DIR}
Expand Down
3 changes: 2 additions & 1 deletion moveit_ros/planning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ find_package(catkin REQUIRED COMPONENTS
tf
tf_conversions
)

find_package(PkgConfig REQUIRED)
pkg_search_module(EIGEN3 REQUIRED eigen3)

Expand Down Expand Up @@ -53,7 +54,7 @@ catkin_package(
moveit_planning_scene_monitor
moveit_collision_plugin_loader
INCLUDE_DIRS
${EIGEN3_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
${THIS_PACKAGE_INCLUDE_DIRS}
CATKIN_DEPENDS
pluginlib
Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/planning_interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ catkin_package(
)

include_directories(${THIS_PACKAGE_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS})

include_directories(SYSTEM
${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/robot_interaction/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ catkin_package(
)

include_directories(include
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS})

include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
link_directories(${orocos_kdl_LIBRARY_DIRS})

add_library(${MOVEIT_LIB_NAME}
Expand Down
4 changes: 2 additions & 2 deletions moveit_ros/visualization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ include_directories(rviz_plugin_render_tools/include
planning_scene_rviz_plugin/include
motion_planning_rviz_plugin/include
trajectory_rviz_plugin/include
${catkin_INCLUDE_DIRS})
${Boost_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS})

include_directories(SYSTEM
${EIGEN3_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
${OGRE_INCLUDE_DIRS})

Expand Down
3 changes: 1 addition & 2 deletions moveit_ros/warehouse/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ catkin_package(
warehouse_ros)

include_directories(warehouse/include)
include_directories(${catkin_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
include_directories(${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

link_directories(${Boost_LIBRARY_DIRS})
link_directories(${catkin_LIBRARY_DIRS})
Expand Down
2 changes: 1 addition & 1 deletion moveit_setup_assistant/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif()
include_directories(include)

find_package(Boost REQUIRED COMPONENTS thread filesystem system program_options)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

find_package(catkin REQUIRED COMPONENTS
Expand Down