Merge pull request #423 from ignitionrobotics/merge_3_4_09232021

Merge 3 -> 4
gazebosim · Sep 24, 2021 · 4c11cc2 · 4c11cc2
2 parents 29876ec + 85f4b58
commit 4c11cc2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
+option(USE_UNOFFICIAL_OGRE_VERSIONS "Accept unsupported Ogre versions in the build" OFF)
 
 #============================================================================
 # Search for project-specific dependencies
@@ -63,15 +63,19 @@ 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})
+# USE_UNOFFICIAL_OGRE_VERSIONS flag
+if (NOT USE_UNOFFICIAL_OGRE_VERSIONS)
+  # 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

diff --git a/Changelog.md b/Changelog.md
@@ -253,7 +253,7 @@
 ### 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
+   To disable the new warning, it is enough to enable the cmake option USE_UNOFFICIAL_OGRE_VERSIONS
     * [Pull request 376](https://github.com/ignitionrobotics/ign-rendering/pull/376)
 
 ### Ignition Rendering 3.5.0 (2021-05-25)

diff --git a/test/integration/camera.cc b/test/integration/camera.cc
@@ -187,6 +187,14 @@ void CameraTest::VisualAt(const std::string &_renderEngine)
             << _renderEngine << std::endl;
     return;
   }
+  else if (_renderEngine == "ogre2")
+  {
+    // VisualAt tests fail on CI, see issue #170
+    // https://github.com/ignitionrobotics/ign-rendering/issues/170
+    igndbg << "VisualAt test is disabled in " << _renderEngine << "."
+           << std::endl;
+    return;
+  }
 
   // create and populate scene
   RenderEngine *engine = rendering::engine(_renderEngine);

diff --git a/test/integration/scene.cc b/test/integration/scene.cc
@@ -32,6 +32,12 @@ using namespace rendering;
 class SceneTest: public testing::Test,
                  public testing::WithParamInterface<const char *>
 {
+  // Documentation inherited
+  public: void SetUp() override
+  {
+    ignition::common::Console::SetVerbosity(4);
+  }
+
   // Test adding and removing visuals
   // Simulates 'levels' where visuals are added and removed throughout
   // frame updates
@@ -148,6 +154,14 @@ void SceneTest::VisualAt(const std::string &_renderEngine)
             << _renderEngine << std::endl;
     return;
   }
+  else if (_renderEngine == "ogre2")
+  {
+    // VisualAt tests fail on CI, see issue #170
+    // https://github.com/ignitionrobotics/ign-rendering/issues/170
+    igndbg << "VisualAt test is disabled in " << _renderEngine << "."
+           << std::endl;
+    return;
+  }
 
   // create and populate scene
   RenderEngine *engine = rendering::engine(_renderEngine);