Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2025

🎉 New feature

Twin of #1175, related to OGRECave/ogre-next#541 should help with conda-forge/gz-rendering-feedstock#42 (comment).

Summary

This is mainly a port of #1175 to be activated under the parameter USE_OGRE2_OVERLAY enabled by default to keep current ABI stable.

Test

Testing on Mac with the option disabled in https://build.osrfoundation.org/job/gz_rendering-ci-pr_any-homebrew-amd64/417/.

Checklist

  • Signed all commits for DCO
  • Was GenAI used to generate this PR

Generated-by: Sonnet 4.0

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by and Generated-by messages.


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

@mergify mergify bot requested a review from iche033 as a code owner October 1, 2025 16:12
Copy link
Contributor Author

mergify bot commented Oct 1, 2025

Cherry-pick of bb0e866 has failed:

On branch mergify/bp/gz-rendering10/pr-1177
Your branch is up to date with 'origin/gz-rendering10'.

You are currently cherry-picking commit bb0e8662.
  (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:   CMakeLists.txt
	modified:   include/gz/rendering/config.hh.in
	modified:   ogre2/include/gz/rendering/ogre2/Ogre2Includes.hh
	modified:   ogre2/include/gz/rendering/ogre2/Ogre2RenderEngine.hh
	modified:   ogre2/src/Ogre2RenderEngine.cc
	modified:   ogre2/src/Ogre2Scene.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Changelog.md

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

@mergify mergify bot added the conflicts label Oct 1, 2025
@github-actions github-actions bot added the 🪵 jetty Gazebo Jetty label Oct 1, 2025
@j-rivero j-rivero changed the title Exclude OGRE2 Overlay using a CMake argument (gz-rendering9) (backport #1177) Exclude OGRE2 Overlay using a CMake argument (gz-rendering10) (backport #1177) Oct 1, 2025
@iche033 iche033 force-pushed the mergify/bp/gz-rendering10/pr-1177 branch from cd23db7 to 28687d7 Compare October 3, 2025 19:02
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Oct 3, 2025
@iche033 iche033 merged commit 294ca67 into gz-rendering10 Oct 3, 2025
14 checks passed
@iche033 iche033 deleted the mergify/bp/gz-rendering10/pr-1177 branch October 3, 2025 19:43
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Oct 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants