Exclude OGRE2 Overlay using a CMake argument (gz-rendering9) #1177
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is mainly a port of #1175 to be activated under the parameter `USE_OGRE2_OVERLAY` enabled by default. Signed-off-by: Jose Luis Rivero <[email protected]>
iche033
reviewed
Sep 24, 2025
| # Build the list of OGRE2 components based on the options | ||
| set(OGRE2_COMPONENTS HlmsPbs HlmsUnlit PlanarReflections) | ||
| if(USE_OGRE2_OVERLAY) | ||
| list(APPEND OGRE2_COMPONENTS Overlay) |
There was a problem hiding this comment.
The ABI checker picked up some compatibility issues. I think we need to set GZ_RENDERING_HAVE_OGRE2_OVERLAY to TRUE here as well.
Signed-off-by: Jose Luis Rivero <[email protected]>
…headers" This reverts commit 05d1834.
Signed-off-by: Jose Luis Rivero <[email protected]>
traversaro
reviewed
Oct 1, 2025
3 tasks
This reverts commit 1131d9c.
Co-authored-by: Silvio Traversaro <[email protected]> Signed-off-by: Jose Luis Rivero <[email protected]>
|
@mergify backport gz-rendering10 |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 1, 2025
* Exclude OGRE2 Overlay using a CMake argument (gz-rendering9) This is mainly a port of #1175 to be activated under the parameter `USE_OGRE2_OVERLAY` enabled by default. --------- Signed-off-by: Jose Luis Rivero <[email protected]> Co-authored-by: Silvio Traversaro <[email protected]> (cherry picked from commit bb0e866) # Conflicts: # Changelog.md
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎉 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_OVERLAYenabled 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
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-byandGenerated-bymessages.