-
Notifications
You must be signed in to change notification settings - Fork 568
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.
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
Depend on rsl::rsl
as a non-ament dependency (backport #2578)
#2589
Conversation
@ChrisThrasher could you take a look at the merge conflicts? |
<<<<<<< HEAD | ||
ament_target_dependencies(moveit_utils Boost moveit_msgs) | ||
======= | ||
ament_target_dependencies(moveit_utils Boost moveit_msgs rclcpp fmt) | ||
target_link_libraries(moveit_utils rsl::rsl) | ||
>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<<<<<<< HEAD | |
ament_target_dependencies(moveit_utils Boost moveit_msgs) | |
======= | |
ament_target_dependencies(moveit_utils Boost moveit_msgs rclcpp fmt) | |
target_link_libraries(moveit_utils rsl::rsl) | |
>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578)) | |
ament_target_dependencies(moveit_utils Boost moveit_msgs) |
In this branch moveit_utils
doesn't depend on rsl::rsl
so the original can be kept.
@@ -19,7 +24,7 @@ target_include_directories(moveit_test_utils PUBLIC | |||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | |||
$<INSTALL_INTERFACE:include/moveit_core> | |||
) | |||
target_link_libraries(moveit_test_utils moveit_robot_model moveit_kinematics_base) | |||
target_link_libraries(moveit_test_utils moveit_robot_model moveit_kinematics_base rsl::rsl) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
target_link_libraries(moveit_test_utils moveit_robot_model moveit_kinematics_base rsl::rsl) |
I don't see this target using rsl::rsl
in this branch so I think this can be removed.
<<<<<<< HEAD | ||
======= | ||
rclcpp | ||
fmt | ||
>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<<<<<<< HEAD | |
======= | |
rclcpp | |
fmt | |
>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578)) |
I think nothing has to change here either. main
uses rclcpp
and fmt
but this branch apparently does not so we don't need to add them.
This PR is stale because it has been open for 45 days with no activity. Please tag a maintainer for help on completing this PR, or close it if you think it has become obsolete. |
Closing this PR due since it does not seem to be relevant for iron |
This is an automatic backport of pull request #2578 done by Mergify.
Cherry-pick of 3df6b28 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com