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

Don't use ament_export_targets from package sub folder #1889

Merged
merged 2 commits into from
Jan 26, 2023
Merged

Don't use ament_export_targets from package sub folder #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da0b248
Sort exports from moveit_core
tylerjw Jan 25, 2023
acda563
Install collision_detector_bullet_plugin from moveit_core
tylerjw Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions moveit_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,23 @@ add_subdirectory(version)

install(
TARGETS
collision_detector_bullet_plugin
moveit_butterworth_filter
moveit_collision_distance_field
moveit_collision_detection
moveit_collision_detection_fcl
moveit_collision_detection_bullet
moveit_dynamics_solver
moveit_collision_detection_fcl
moveit_collision_distance_field
moveit_constraint_samplers
moveit_distance_field
moveit_dynamics_solver
moveit_exceptions
moveit_kinematics_base
moveit_kinematic_constraints
moveit_kinematics_base
moveit_kinematics_metrics
moveit_macros
moveit_planning_interface
moveit_planning_scene
moveit_planning_request_adapter
moveit_planning_scene
moveit_robot_model
moveit_robot_state
moveit_robot_trajectory
Expand Down
6 changes: 0 additions & 6 deletions moveit_core/collision_detection_bullet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ target_link_libraries(collision_detector_bullet_plugin

install(DIRECTORY include/ DESTINATION include/moveit_core)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/moveit_collision_detection_bullet_export.h DESTINATION include/moveit_core)
install(TARGETS moveit_collision_detection_bullet collision_detector_bullet_plugin EXPORT export_moveit_collision_detection_bullet
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin
)
ament_export_targets(export_moveit_collision_detection_bullet HAS_LIBRARY_TARGET)

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
Expand Down