Don't use ament_export_targets from package sub folder (backport #1889)…

… (#1893)
moveit · Aug 23, 2023 · b9ef75d · b9ef75d
1 parent a1789ff
commit b9ef75d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 38 deletions.
diff --git a/moveit_core/CMakeLists.txt b/moveit_core/CMakeLists.txt
@@ -85,35 +85,6 @@ set(THIS_PACKAGE_INCLUDE_DIRS
     utils/include
 )
 
-set(THIS_PACKAGE_LIBRARIES
-    moveit_butterworth_filter
-    moveit_butterworth_parameters
-    moveit_collision_distance_field
-    moveit_collision_detection
-    moveit_collision_detection_fcl
-    moveit_collision_detection_bullet
-    moveit_dynamics_solver
-    moveit_constraint_samplers
-    moveit_distance_field
-    moveit_exceptions
-    moveit_kinematics_base
-    moveit_kinematic_constraints
-    moveit_kinematics_metrics
-    moveit_planning_interface
-    moveit_planning_scene
-    moveit_planning_request_adapter
-    # TODO: Port python bindings
-    # moveit_python_tools
-    moveit_robot_model
-    moveit_robot_state
-    moveit_robot_trajectory
-    moveit_smoothing_base
-    moveit_test_utils
-    moveit_trajectory_processing
-    moveit_transforms
-    moveit_utils
-)
-
 set(THIS_PACKAGE_INCLUDE_DEPENDS
   angles
   eigen_stl_containers
@@ -212,7 +183,34 @@ add_subdirectory(collision_detection_fcl)
 
 
 install(
-  TARGETS ${THIS_PACKAGE_LIBRARIES}
+  TARGETS
+    collision_detector_bullet_plugin
+    moveit_butterworth_filter
+    moveit_butterworth_parameters
+    moveit_collision_distance_field
+    moveit_collision_detection
+    moveit_collision_detection_fcl
+    moveit_collision_detection_bullet
+    moveit_dynamics_solver
+    moveit_constraint_samplers
+    moveit_distance_field
+    moveit_exceptions
+    moveit_kinematics_base
+    moveit_kinematic_constraints
+    moveit_kinematics_metrics
+    moveit_planning_interface
+    moveit_planning_scene
+    moveit_planning_request_adapter
+    # TODO: Port python bindings
+    # moveit_python_tools
+    moveit_robot_model
+    moveit_robot_state
+    moveit_robot_trajectory
+    moveit_smoothing_base
+    moveit_test_utils
+    moveit_trajectory_processing
+    moveit_transforms
+    moveit_utils
   EXPORT export_${PROJECT_NAME}
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib

diff --git a/moveit_core/collision_detection_bullet/CMakeLists.txt b/moveit_core/collision_detection_bullet/CMakeLists.txt
@@ -47,14 +47,8 @@ target_link_libraries(collision_detector_bullet_plugin
   moveit_planning_scene
 )
 
-install(DIRECTORY include/ DESTINATION include)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MOVEIT_LIB_NAME}_export.h DESTINATION include)
-install(TARGETS ${MOVEIT_LIB_NAME} collision_detector_bullet_plugin EXPORT export_${MOVEIT_LIB_NAME}
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin
-)
-ament_export_targets(export_${MOVEIT_LIB_NAME} HAS_LIBRARY_TARGET)
+install(DIRECTORY include/ DESTINATION include/moveit_core)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/moveit_collision_detection_bullet_export.h DESTINATION include/moveit_core)
 
 if(BUILD_TESTING)
   if(WIN32)