Fix Bullet cmake configuration

moveit · Jun 16, 2021 · cd2fd4e · cd2fd4e
1 parent 0d47e11
commit cd2fd4e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/moveit_core/CMakeLists.txt b/moveit_core/CMakeLists.txt
@@ -127,14 +127,14 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
   Eigen3
   eigen3_cmake_module
   OCTOMAP
+  Bullet
 )
 
 pluginlib_export_plugin_description_file(moveit_core collision_detector_fcl_description.xml)
 pluginlib_export_plugin_description_file(moveit_core collision_detector_bullet_description.xml)
 
 include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS}
   ${LIBFCL_INCLUDE_DIRS}
-  ${BULLET_INCLUDE_DIRS}
 )
 
 include_directories(${THIS_PACKAGE_INCLUDE_DIRS}

diff --git a/moveit_core/collision_detection_bullet/CMakeLists.txt b/moveit_core/collision_detection_bullet/CMakeLists.txt
@@ -10,7 +10,9 @@ add_library(${MOVEIT_LIB_NAME} SHARED
   src/bullet_integration/ros_bullet_utils.cpp
 )
 set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
-
+ament_target_dependencies(${MOVEIT_LIB_NAME} SYSTEM
+  BULLET
+)
 ament_target_dependencies(${MOVEIT_LIB_NAME}
   rclcpp
   rmw_implementation
@@ -22,22 +24,24 @@ ament_target_dependencies(${MOVEIT_LIB_NAME}
 )
 target_link_libraries(${MOVEIT_LIB_NAME}
   moveit_collision_detection
-  ${BULLET_LIBRARIES}
 )
 
 add_library(collision_detector_bullet_plugin SHARED src/collision_detector_bullet_plugin_loader.cpp)
 set_target_properties(collision_detector_bullet_plugin PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
-target_link_libraries(collision_detector_bullet_plugin PUBLIC
-  ${MOVEIT_LIB_NAME}
-  moveit_planning_scene
+ament_target_dependencies(collision_detector_bullet_plugin SYSTEM
+  BULLET
 )
-ament_target_dependencies(collision_detector_bullet_plugin PUBLIC
+ament_target_dependencies(collision_detector_bullet_plugin
   rclcpp
   urdf
   visualization_msgs
   pluginlib
   rmw_implementation
 )
+target_link_libraries(collision_detector_bullet_plugin
+  ${MOVEIT_LIB_NAME}
+  moveit_planning_scene
+)
 
 install(DIRECTORY include/ DESTINATION include)
 install(TARGETS ${MOVEIT_LIB_NAME} EXPORT ${MOVEIT_LIB_NAME}