Skip to content

Commit

Permalink
If ogre-1.10 is found, skip the 1.9 check
Browse files Browse the repository at this point in the history
  • Loading branch information
j-rivero committed Aug 11, 2021
1 parent c57a8e5 commit 90ebd1e
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,16 @@ if (NOT USE_UNOFFICAL_OGRE_VERSIONS)
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()

ign_find_package(IgnOGRE VERSION 1.9.0
COMPONENTS ${ign_ogre_components}
REQUIRED_BY ogre
PRIVATE_FOR ogre)

if (OGRE_FOUND)
# find boost - mainly needed on macOS and also by the terrain component
find_package(Boost)
Expand Down

0 comments on commit 90ebd1e

Please sign in to comment.