Skip to content

Commit

Permalink
fix cmake of pr2_teleop_general
Browse files Browse the repository at this point in the history
- remove depend to bullet, it already removed from code long time ago 64b6027
- use  ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}, instead of *msgs_gencpp
  • Loading branch information
k-okada committed Feb 14, 2018
1 parent cc2ece1 commit a694626
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions pr2_teleop_general/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ include_directories(include ${catkin_INCLUDE_DIRS})
catkin_package(
CATKIN_DEPENDS roscpp actionlib actionlib_msgs geometry_msgs sensor_msgs pr2_msgs pr2_controllers_msgs pr2_controller_manager pr2_mechanism_msgs angles urdf ps3joy pr2_common_action_msgs polled_camera moveit_msgs tf
INCLUDE_DIRS include
DEPENDS bullet
LIBRARIES pr2_teleop_general_commander
)

Expand All @@ -20,13 +19,11 @@ target_link_libraries(pr2_teleop_general_keyboard ${catkin_LIBRARIES} pr2_teleo


add_library(pr2_teleop_general_commander src/pr2_teleop_general_commander.cpp)
add_dependencies(pr2_teleop_general_commander pr2_common_action_msgs_gencpp)
add_dependencies(pr2_teleop_general_commander ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})


target_link_libraries(pr2_teleop_general_commander ${catkin_LIBRARIES})
add_dependencies(pr2_teleop_general_commander gencpp ${PROJECT_NAME}_gencpp tf_gencpp)

add_dependencies(pr2_teleop_general_commander kinematics_msgs_gencpp)
add_dependencies(pr2_teleop_general_commander ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

install(TARGETS pr2_teleop_general_joystick pr2_teleop_general_keyboard pr2_teleop_general_commander
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
Expand Down

0 comments on commit a694626

Please sign in to comment.