Skip to content

Commit

Permalink
Avoid configure warning when checking ogre-1.10 (#411)
Browse files Browse the repository at this point in the history
* Avoid warning on missing components when detecting ogre 1.10

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
  • Loading branch information
j-rivero committed Sep 16, 2021
1 parent 08ee26c commit 32d2aa3
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,17 @@ list(APPEND ign_ogre_components "RTShaderSystem" "Terrain" "Overlay")
# 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})
# Only for checking the ogre version
ign_find_package(IgnOGRE VERSION 1.10 QUIET)

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")
ign_find_package(IgnOGRE VERSION 1.10
COMPONENTS ${ign_ogre_components}
REQUIRED_BY ogre
PRIVATE_FOR ogre)
else()
# If ogre 1.10 or greater was not found, then proceed to look for 1.9.x
# versions which are offically supported
Expand Down

0 comments on commit 32d2aa3

Please sign in to comment.