From a712899aa114ac32d351ad1a51afe6a9e1327bff Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 3 Dec 2024 19:37:45 +0100 Subject: [PATCH] Ogre and Ogre2 are not compatible. Prefer to have Ogre2. Signed-off-by: Jose Luis Rivero --- test/test_config.h.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/test_config.h.in b/test/test_config.h.in index 64a1bbb63..45f15ae5c 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -17,12 +17,14 @@ #ifdef __APPLE__ static const std::vector kRenderEngineTestValues{"ogre", "optix"}; #else + /// We can not mix ogre and ogre2 tests in Fortress for a single test file + /// prefer here ogre2 over ogre. #if defined(HAVE_OGRE) && defined(HAVE_OPTIX) && defined(HAVE_OGRE2) - static const std::vector kRenderEngineTestValues{"ogre", "ogre2", "optix"}; + static const std::vector kRenderEngineTestValues{"ogre2", "optix"}; #elif defined(HAVE_OGRE) && defined(HAVE_OPTIX) static const std::vector kRenderEngineTestValues{"ogre", "optix"}; #elif defined(HAVE_OGRE) && defined(HAVE_OGRE2) - static const std::vector kRenderEngineTestValues{"ogre", "ogre2"}; + static const std::vector kRenderEngineTestValues{"ogre2"}; #elif defined(HAVE_OGRE2) && defined(HAVE_OPTIX) static const std::vector kRenderEngineTestValues{"ogre2", "optix"}; #elif defined(HAVE_OGRE)