Depend on rsl::rsl as a non-ament dependency (backport #2578)

[mergify]

This is an automatic backport of pull request #2578 done by Mergify.
Cherry-pick of 3df6b28 has failed:

On branch mergify/bp/humble/pr-2578
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 3df6b2813.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_core/utils/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

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> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[henningkayser]

@ChrisThrasher could you take a look at the merge conflicts?

[ChrisThrasher]

Suggested change

	<<<<<<< HEAD
	ament_target_dependencies(${MOVEIT_LIB_NAME} Boost moveit_msgs)
	set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
	=======
	target_include_directories(moveit_utils PUBLIC
	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
	$<INSTALL_INTERFACE:include/moveit_core>
	)
	ament_target_dependencies(moveit_utils Boost moveit_msgs rclcpp fmt)
	target_link_libraries(moveit_utils rsl::rsl)
	set_target_properties(moveit_utils PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
	>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578))
	ament_target_dependencies(${MOVEIT_LIB_NAME} Boost moveit_msgs)
	set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")

RSL isn't being used so we can ignore the incoming changes.

[ChrisThrasher]

Suggested change

	<<<<<<< HEAD
	set(MOVEIT_TEST_LIB_NAME moveit_test_utils)
	add_library(${MOVEIT_TEST_LIB_NAME} SHARED src/robot_model_test_utils.cpp)
	target_link_libraries(${MOVEIT_TEST_LIB_NAME} moveit_robot_model)
	ament_target_dependencies(${MOVEIT_TEST_LIB_NAME}
	=======
	add_library(moveit_test_utils SHARED src/robot_model_test_utils.cpp)
	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 rsl::rsl)
	ament_target_dependencies(moveit_test_utils
	>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578))
	ament_index_cpp
	Boost
	geometry_msgs
	urdf
	srdfdom
	urdfdom
	urdfdom_headers
	<<<<<<< HEAD
	=======
	rclcpp
	fmt
	>>>>>>> 3df6b2813 (Depend on `rsl::rsl` as a non-Ament dependency (#2578))
	set(MOVEIT_TEST_LIB_NAME moveit_test_utils)
	add_library(${MOVEIT_TEST_LIB_NAME} SHARED src/robot_model_test_utils.cpp)
	target_link_libraries(${MOVEIT_TEST_LIB_NAME} moveit_robot_model)
	ament_target_dependencies(${MOVEIT_TEST_LIB_NAME}
	ament_index_cpp
	Boost
	geometry_msgs
	urdf
	srdfdom
	urdfdom
	urdfdom_headers

Like before, RSL is not being used in this branch so the incoming changes can be ignored.

[github-actions]

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.