From a6946263cc53764f2990e8b98ca16e319247c3b9 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 14 Feb 2018 18:30:54 +0900 Subject: [PATCH] fix cmake of pr2_teleop_general - remove depend to bullet, it already removed from code long time ago https://github.com/PR2/pr2_apps/pull/8/commits/64b60278bc02e83b1826f6f122b573e298476285 - use ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}, instead of *msgs_gencpp --- pr2_teleop_general/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pr2_teleop_general/CMakeLists.txt b/pr2_teleop_general/CMakeLists.txt index b2d514b..b33f58c 100644 --- a/pr2_teleop_general/CMakeLists.txt +++ b/pr2_teleop_general/CMakeLists.txt @@ -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 ) @@ -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}