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

Lint visualization #1141

Merged
merged 5 commits into from
Oct 25, 2018
Merged

Lint visualization #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
409394c
Sort dependencies alphabetically
Chamango90 Oct 25, 2018
7b51237
Add missing dependencies
Chamango90 Oct 25, 2018
6df7d64
Fix rostest deps
Chamango90 Oct 25, 2018
dc899a8
Use CATKIN_GLOBAL_INCLUDE_DESTINATION
Chamango90 Oct 25, 2018
fc832a7
Remove link_directories
Chamango90 Oct 25, 2018
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
37 changes: 18 additions & 19 deletions moveit_ros/visualization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,21 @@ pkg_check_modules(OGRE OGRE)
link_directories( ${OGRE_LIBRARY_DIRS} )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is indeed needed, as pkg-config only reports -lOgreMain -lpthread only.


find_package(catkin REQUIRED COMPONENTS
moveit_ros_planning_interface
moveit_ros_robot_interaction
moveit_ros_warehouse
moveit_ros_perception
class_loader
eigen_conversions
geometric_shapes
interactive_markers
class_loader
moveit_ros_perception
moveit_ros_planning_interface
moveit_ros_robot_interaction
moveit_ros_warehouse
object_recognition_msgs
pluginlib
rosconsole
roscpp
rospy
rviz
tf
roscpp
rosconsole
object_recognition_msgs
rostest
)

find_package(Eigen3 REQUIRED)
Expand Down Expand Up @@ -63,20 +64,21 @@ add_definitions(-DQT_NO_KEYWORDS)

catkin_package(
LIBRARIES
moveit_rviz_plugin_render_tools
moveit_robot_state_rviz_plugin_core
moveit_motion_planning_rviz_plugin_core
moveit_trajectory_rviz_plugin_core
moveit_planning_scene_rviz_plugin_core
moveit_robot_state_rviz_plugin_core
moveit_rviz_plugin_render_tools
moveit_trajectory_rviz_plugin_core
INCLUDE_DIRS
rviz_plugin_render_tools/include
robot_state_rviz_plugin/include
planning_scene_rviz_plugin/include
motion_planning_rviz_plugin/include
planning_scene_rviz_plugin/include
robot_state_rviz_plugin/include
rviz_plugin_render_tools/include
trajectory_rviz_plugin/include
CATKIN_DEPENDS
moveit_ros_planning_interface
moveit_ros_robot_interaction
object_recognition_msgs
DEPENDS
EIGEN3
)
Expand All @@ -97,9 +99,6 @@ include_directories(SYSTEM
${QT_INCLUDE_DIR}
${OGRE_INCLUDE_DIRS})

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

add_subdirectory(rviz_plugin_render_tools)
add_subdirectory(robot_state_rviz_plugin)
add_subdirectory(planning_scene_rviz_plugin)
Expand All @@ -116,6 +115,6 @@ install(FILES
install(DIRECTORY icons DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

if (CATKIN_ENABLE_TESTING)
find_package(rostest)
find_package(rostest REQUIRED)
add_rostest(test/moveit_joy.test)
endif()
2 changes: 1 addition & 1 deletion moveit_ros/visualization/motion_planning_rviz_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ add_library(${MOVEIT_LIB_NAME} src/plugin_init.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})

install(TARGETS ${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand Down
34 changes: 19 additions & 15 deletions moveit_ros/visualization/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,34 @@
<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>pkg-config</buildtool_depend>

<build_depend>roscpp</build_depend>
<build_depend>rviz</build_depend>
<build_depend>class_loader</build_depend>
<build_depend>eigen</build_depend>
<build_depend>eigen_conversions</build_depend>
<build_depend>geometric_shapes</build_depend>
<build_depend>interactive_markers</build_depend>
<build_depend>moveit_ros_robot_interaction</build_depend>
<build_depend>moveit_ros_perception</build_depend>
<build_depend>moveit_ros_planning_interface</build_depend>
<build_depend>moveit_ros_warehouse</build_depend>
<build_depend>moveit_ros_robot_interaction</build_depend>
<build_depend version_gte="1.11.2">pluginlib</build_depend>
<build_depend>interactive_markers</build_depend>
<build_depend>geometric_shapes</build_depend>
<build_depend>object_recognition_msgs</build_depend>
<build_depend>moveit_ros_perception</build_depend>
<build_depend>eigen</build_depend>
<build_depend version_gte="1.11.2">pluginlib</build_depend>
<build_depend>rosconsole</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>rospy</build_depend>
<build_depend>rviz</build_depend>
<build_depend>tf</build_depend>

<run_depend>roscpp</run_depend>
<run_depend>rviz</run_depend>
<run_depend>geometric_shapes</run_depend>
<run_depend>interactive_markers</run_depend>
<run_depend>moveit_ros_robot_interaction</run_depend>
<run_depend>moveit_ros_perception</run_depend>
<run_depend>moveit_ros_planning_interface</run_depend>
<run_depend>moveit_ros_warehouse</run_depend>
<run_depend>moveit_ros_robot_interaction</run_depend>
<run_depend version_gte="1.11.2">pluginlib</run_depend>
<run_depend>interactive_markers</run_depend>
<run_depend>geometric_shapes</run_depend>
<run_depend>object_recognition_msgs</run_depend>
<run_depend>moveit_ros_perception</run_depend>
<run_depend version_gte="1.11.2">pluginlib</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>rospy</run_depend>
<run_depend>rviz</run_depend>

<test_depend>rostest</test_depend>

Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/visualization/planning_scene_rviz_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ add_library(${MOVEIT_LIB_NAME} src/plugin_init.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})

install(TARGETS ${MOVEIT_LIB_NAME}_core ${MOVEIT_LIB_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/visualization/robot_state_rviz_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ add_library(${MOVEIT_LIB_NAME} src/plugin_init.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})

install(TARGETS ${MOVEIT_LIB_NAME}_core ${MOVEIT_LIB_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/visualization/rviz_plugin_render_tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
${Boost_LIBRARIES}
)

install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})

install(TARGETS ${MOVEIT_LIB_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand Down
2 changes: 1 addition & 1 deletion moveit_ros/visualization/trajectory_rviz_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ add_library(${MOVEIT_LIB_NAME} src/plugin_init.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION})
target_link_libraries(${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core ${catkin_LIBRARIES} ${Boost_LIBRARIES})

install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION})

install(TARGETS ${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand Down