Fix check for ogre when using USE_UNOFFICIAL_OGRE_VERSIONS

gazebosim · Oct 4, 2021 · 5b8f915 · 5b8f915
1 parent f93c796
commit 5b8f915
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,16 +79,18 @@ if (NOT USE_UNOFFICIAL_OGRE_VERSIONS)
       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
-    ign_find_package(IgnOGRE VERSION 1.9.0
-      COMPONENTS ${ign_ogre_components}
-      REQUIRED_BY ogre
-      PRIVATE_FOR ogre)
   endif()
 endif()
 
+if (NOT OGRE_FOUND)
+  # 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()
+
 if (OGRE_FOUND)
   # find boost - mainly needed on macOS and also by the terrain component
   find_package(Boost)

diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,9 @@
 
 ### Ignition Rendering 6.X
 
+1. Fix check for ogre when using USE_UNOFFICIAL_OGRE_VERSIONS
+    * [Pull request #xxx](https://github.com/ignitionrobotics/ign-rendering/pull/xxx)
+
 ### Ignition Rendering 6.0.1 (2021-10-01)
 
 1. Disable using selection buffer for ray queries