-
Notifications
You must be signed in to change notification settings - Fork 31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Find Ogre 2-2 #157
Find Ogre 2-2 #157
Conversation
Signed-off-by: ahcorde <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we're going to have to maintain compatibility with both for a little bit, since we aren't bumping the major version on ign-cmake. This will actually stop OGRE 2.1 from being found.
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
cmake/FindIgnOGRE2.cmake
Outdated
@@ -53,6 +53,14 @@ if (${IgnOGRE2_FIND_VERSION_MAJOR}) | |||
endif() | |||
endif() | |||
|
|||
if (${IgnOGRE2_FIND_VERSION_MINOR} VERSION_EQUAL "2") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thinking on the future and to avoid the assumption that not 2 is 1, could work something like:
message(STATUS "-- Finding OGRE 2.${IgnOGRE2_FIND_VERSION_MINOR}")
set(OGRE2_INSTALL_PATH "OGRE-2.${IgnOGRE2_FIND_VERSION_MINOR}")
instead of the whole if block?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Testing the thing in a colcon workspace with current ogre-2.1 package + rendering4, the thing compiles just fine. I would not expect regressions with current changes.
We probably need to make some changes to make it work on Windows with different package managers/buildsystems. That could be done in a different PR.
I just notice that the ogre-2.2 example can work with ogre-2.1 using current versions of ign-cmake from .debs returning ogre-2.1 paths. We probably need to implement checks on the consumers of this ign-cmake version (i.e: ign-rendering) to pull these changes into the mix to work correctly.
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: ahcorde [email protected]
🦟 Bug fix
Related with this issue gazebosim/gz-rendering#223
Summary
This PR allows to find OGRE 2-2
Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge