Revert OGRE-Next custom support and back to use IgnOGRE2 module #605
Conversation
ign-cmake support to deal with Ubuntu Jammy's ogre-next package is under review and will make the custom workaround in the CMake code of this project not needed anymore. This commit partially reverts the changes introduced in f043b4f. Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
|
I think that we are going to need a new release of ign-cmake to be able to check CI. |
CMakeLists.txt
Outdated
| PRIVATE_FOR ogre2 | ||
| QUIET) | ||
|
|
||
| if (NOT OGRE2_FOUND) |
There was a problem hiding this comment.
maybe check to see if ${OGRE2-PlanarReflections} equals "OGRE2-PlanarReflections-NOTFOUND" here?
There was a problem hiding this comment.
uh much better, thanks Ian 3fd7e1d.
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
|
I think that CI is going to require new ignition cmake to work. We need to bump the ign-cmake version required here too. |
|
@osrf-jenkins run tests please |
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
|
Ummm, we have a problem that is hard to solve or workaround in ign-rendering. The two calls for |
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
Codecov Report
@@ Coverage Diff @@
## ign-rendering6 #605 +/- ##
===================================================
+ Coverage 54.34% 80.00% +25.65%
===================================================
Files 198 1 -197
Lines 20225 15 -20210
===================================================
- Hits 10991 12 -10979
+ Misses 9234 3 -9231 Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Nice! I see this on the Bionic and Focal builds:
-- Looking for OGRE using the name: OGRE2
-- + component HlmsPbs: found
-- + component HlmsUnlit: found
-- + component Overlay: found
-- ! component PlanarReflections: not found!
-- ! OGRE2 not found
-- Looking for OGRE using the name: OGRE-Next
-- ! OGRE-Next not found
-- Looking for IgnOGRE2 - not found
-- PlanarReflections component was not found. Try looking without it:
-- Looking for OGRE using the name: OGRE2
-- + component HlmsPbs: found
-- + component HlmsUnlit: found
-- + component Overlay: found
-- Looking for IgnOGRE2 - found
It looks like Jammy CI is not on ign-rendering6 anymore and was reverted with a commit directly to the branch:
We should make sure this patch works with Jammy. Can we add back that CI here?
here we go 619c9b6
my bad sorry, wrong branch. |
There was a problem hiding this comment.
Nice! I see Jammy finds it now:
-- Looking for OGRE using the name: OGRE2
-- ! OGRE2 not found
-- Looking for OGRE using the name: OGRE-Next
-- + component HlmsPbs: found
-- + component HlmsUnlit: found
-- + component Overlay: found
-- + component PlanarReflections: found
-- Looking for IgnOGRE2 - found
馃殺 it!
|
This pull request has been mentioned on Gazebo Community. There might be relevant details there: https://community.gazebosim.org/t/new-releases-2022-04-27-fortress-citadel/1389/1 |
馃帀 New feature
The PR mostly removes the support introduced in #577 to workaround the problems with Ubuntu Jammy using ogre-next package. The support is implemented in gazebosim/gz-cmake#224 that should work transparently for ign-rendering.
The PR tries to look for OGRE2 twice, one with PlanarRelections component (needed for Jammy) and the other one without PlanarReflections. The issues is being worked in #597
Test it
Colcon workspace with gazebosim/gz-cmake#224 and this PR should be enough.
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.