Skip to content

Commit

Permalink
fixed ament lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jrgnicho committed Mar 2, 2021
1 parent 4d18723 commit 45b539c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions moveit_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ add_subdirectory(collision_distance_field)
add_subdirectory(kinematics_metrics)
add_subdirectory(dynamics_solver)
# TODO(henningkayser): enable bullet once the library is migrated to ROS2
if(BULLET_ENABLE)
add_subdirectory(collision_detection_bullet)
else()
install(FILES collision_detection_bullet/empty_description.xml DESTINATION share/${PROJECT_NAME} RENAME collision_detector_bullet_description.xml)
endif()
if(BULLET_ENABLE)
add_subdirectory(collision_detection_bullet)
else()
install(FILES collision_detection_bullet/empty_description.xml DESTINATION share/${PROJECT_NAME} RENAME collision_detector_bullet_description.xml)
endif()

ament_export_include_directories(include)
ament_export_libraries(${THIS_PACKAGE_LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion moveit_core/collision_detection_bullet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ament_target_dependencies(${MOVEIT_LIB_NAME}
visualization_msgs
)
target_link_libraries(${MOVEIT_LIB_NAME}
moveit_collision_detection
moveit_collision_detection
${BULLET_LIBRARIES}
)

Expand Down

0 comments on commit 45b539c

Please sign in to comment.