Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 26, 2025

Needs ros-controls/ros2_control_cmake#7 first

in gz_ros2_control we have CMAKE_C_STANDARD 11, was there a reason for a different setup than the official guidelines?

Not sure about CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, no one ever requested this for windows builds. Maybe it is not even necessary for plugins.


This is an automatic backport of pull request #588 done by Mergify.

(cherry picked from commit a5c5448)

# Conflicts:
#	gz_ros2_control/package.xml
@mergify mergify bot requested a review from ahcorde as a code owner May 26, 2025 08:24
@mergify mergify bot added the conflicts label May 26, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 26, 2025

Cherry-pick of a5c5448 has failed:

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

You are currently cherry-picking commit a5c5448.
  (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)

Changes to be committed:
	modified:   gz_ros2_control/CMakeLists.txt
	modified:   gz_ros2_control/src/gz_ros2_control_plugin.cpp
	modified:   gz_ros2_control_demos/CMakeLists.txt
	modified:   gz_ros2_control_demos/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gz_ros2_control/package.xml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@christophfroehlich
Copy link
Contributor

we haven't released it to humble

@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-588 branch October 2, 2025 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants