Set OGRE minimal version to 1.8. Warn on versions not supported (ign-rendering3) #376
+26
−6
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,7 @@ ign_configure_project(VERSION_SUFFIX) | |
| # Set project-specific options | ||
| #============================================================================ | ||
|
|
||
| option(USE_UNOFFICAL_OGRE_VERSIONS "Accept unsupported Ogre versions in the build" OFF) | ||
|
|
||
| #============================================================================ | ||
| # Search for project-specific dependencies | ||
|
|
@@ -61,7 +61,21 @@ endif() | |
| # Find OGRE | ||
| list(APPEND ign_ogre_components "RTShaderSystem" "Terrain" "Overlay") | ||
|
|
||
| # Ogre versions greater than 1.9 are not officialy supported. | ||
| # Display a warning for the users on this setup unless they provide | ||
| # USE_UNOFFICAL_OGRE_VERSIONS flag | ||
| if (NOT USE_UNOFFICAL_OGRE_VERSIONS) | ||
| ign_find_package(IgnOGRE VERSION 1.10 | ||
| COMPONENTS ${ign_ogre_components}) | ||
|
|
||
| if (OGRE_FOUND) | ||
| IGN_BUILD_WARNING("Ogre 1.x versions greater than 1.9 are not officially supported." | ||
| "The software might compile and event work but support from upstream" | ||
| "could be reduced to accept patches for newer versions") | ||
| endif() | ||
| endif() | ||
|
|
||
| ign_find_package(IgnOGRE VERSION 1.9.0 | ||
|
There was a problem hiding this comment. I think we can skip looking for 1.9.0 if 1.10 is found? There was a problem hiding this comment. how about this 90ebd1e ? |
||
| COMPONENTS ${ign_ogre_components} | ||
| REQUIRED_BY ogre | ||
| PRIVATE_FOR ogre) | ||
|
|
||
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
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.
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.
event- >evenTo confirm, I think this means we will provided limited support in the form of accepting patches for newer versions but not actively develop against them right?
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.
Eh yes, that is my idea but you Ian or @chapulina probably have it clearer in your mind. Please feel free to reformulate to somehow explain that we won't fix bug on other versions of Ogre but we accept all kind of patches to make it happen.
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.
Got it. A couple of minor suggestions are:
event->even, andaccept->acceptingThere 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.
Done c57a8e5