Skip to content

Commit

Permalink
Merge 90ebd1e into 9341eb2
Browse files Browse the repository at this point in the history
  • Loading branch information
j-rivero authored Aug 11, 2021
2 parents 9341eb2 + 90ebd1e commit e56de72
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
26 changes: 21 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ign_configure_project(VERSION_SUFFIX)
# Set project-specific options
#============================================================================

# ignition-rendering currently has no options that are unique to it
option(USE_UNOFFICAL_OGRE_VERSIONS "Accept unsupported Ogre versions in the build" OFF)

#============================================================================
# Search for project-specific dependencies
Expand Down Expand Up @@ -61,10 +61,26 @@ endif()
# Find OGRE
list(APPEND ign_ogre_components "RTShaderSystem" "Terrain" "Overlay")

ign_find_package(IgnOGRE VERSION 1.8.0
COMPONENTS ${ign_ogre_components}
REQUIRED_BY ogre
PRIVATE_FOR ogre)
# 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 even work but support from upstream"
"could be reduced to accepting patches for newer versions")
else()
# If ogre 1.10 or greater was not found, then proceed to look for 1.9.x
# versions which are offically supported
ign_find_package(IgnOGRE VERSION 1.9.0
COMPONENTS ${ign_ogre_components}
REQUIRED_BY ogre
PRIVATE_FOR ogre)
endif()
endif()

if (OGRE_FOUND)
# find boost - mainly needed on macOS and also by the terrain component
Expand Down
6 changes: 5 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## Ignition Rendering

### Ignition Rendering 3.X.X (2021-XX-XX)
### Ignition Rendering 3.x.x (2021-XX-XX)

1. CMake warning on Ogre versions that are not officially supported.
To disable the new warning, it is enough to enable the cmake option USE_UNOFFICAL_OGRE_VERSIONS
* [Pull request 376](https://github.com/ignitionrobotics/ign-rendering/pull/376)

### Ignition Rendering 3.5.0 (2021-05-25)

Expand Down

0 comments on commit e56de72

Please sign in to comment.