ogre: Do not assume that ogre plugins have lib prefix on macOS #454
Conversation
This file contains 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
|
(I will fix the DCO as soon as I am back to my laptop : ) ) |
Codecov Report
@@ Coverage Diff @@
## ign-rendering3 #454 +/- ##
==================================================
- Coverage 53.35% 53.35% -0.01%
==================================================
Files 131 131
Lines 12036 12035 -1
==================================================
- Hits 6422 6421 -1
Misses 5614 5614
Continue to review full report at Codecov.
|
Signed-off-by: Silvio <silvio@traversaro.it>
Done. |
iche033
approved these changes
Oct 7, 2021
3 tasks
This was referenced Oct 7, 2021
iche033
added a commit
that referenced
this pull request
Oct 19, 2021
* ogre: Do not assume that ogre plugins have lib prefix on macOS (#454) Signed-off-by: Silvio <silvio@traversaro.it> * Fix compilation against Ogre 1.10.12 (#390) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org> * Avoid symbol redefition to fix armel builds (#457) * Avoid symbol redefiniition on armel builds Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> * Fix logic on warning for ogre versions different than 1.9.x (#465) * Fix logic on warning for ogre versions different than 1.9.x Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org> * Fix context attributes of glXCreateContextAttribsARB. (#460) Signed-off-by: Hill Ma <hillma@google.com> Co-authored-by: Silvio Traversaro <silvio@traversaro.it> Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org> Co-authored-by: Hill Ma <mahiuchun@users.noreply.github.com>
srmainwaring
pushed a commit
to srmainwaring/gz-rendering
that referenced
this pull request
Oct 21, 2021
…osim#454) Signed-off-by: Silvio <silvio@traversaro.it>
WilliamLewww
pushed a commit
to WilliamLewww/ign-rendering
that referenced
this pull request
Dec 7, 2021
…osim#454) Signed-off-by: Silvio <silvio@traversaro.it> Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
|
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-ignition-releases-2022-01-10/1228/1 |
3 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.
🦟 Bug fix
Fix most of the test suite when running against ogre with conda-forge-provided dependencies on macOS.
Summary
By default, ogre plugins (the one that are installed under
lib\OGRE\<..>and that are loaded at runtime) are not built with thelibprefix on any platform. However, for legacy reasons (see comment in https://github.com/osrf/homebrew-simulation/blame/f27e070d08600f77933f5608df8d413bc99b2206/Formula/ogre1.9.rb#L105) theogre1.9contained both the deprecatedlib\OGRE\libRenderSystem_GL.dyliband the recommended to uselib\OGRE\RenderSystem_GL.dylib. Furthermore, the ignition-rendering ogre plugin only looked for the library starting withlibon macOS, creating runtime problems on macOS distributions in which ogre did not had the plugin that started withlib, such as conda-forge, but I imagine that on vcpkg on macOS you could get a similar problem.This PR switches also igniton-rendering to only look for ogre plugins without the
libprefix. It is basically the backport of the gazebo commit gazebosim/gazebo-classic@2dd748d#diff-ed2a31885765b0b34495723b06e6ce939e978bb42f5c082a9b93b9fec20257a2 from gazebo8/2017 that was never forward ported to ignition-rendering.As the homebrew bottles provide ogre plugins without the
libprefix since at least 5 years (see comment https://github.com/osrf/homebrew-simulation/blame/f27e070d08600f77933f5608df8d413bc99b2206/Formula/ogre1.9.rb#L105) I think there is a low risk of creating problems (even because if anyone has a system in which gazebo classic works fine, then also ignition-rendering will work fine after this PR).Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge