From 94dbc51f085d889d03e5bf0c4b7c44c7fcea26ac Mon Sep 17 00:00:00 2001
From: Ian Chen <ichen@osrfoundation.org>
Date: Tue, 14 Sep 2021 18:11:03 -0700
Subject: [PATCH] switch to ogre 1.x test on macos

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
---
 ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh | 2 +-
 ogre2/src/Ogre2DepthCamera.cc                               | 1 +
 ogre2/src/Ogre2ThermalCamera.cc                             | 1 +
 test/test_config.h.in                                       | 5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh
index 0acd2d241..229157378 100644
--- a/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh
+++ b/ogre2/include/ignition/rendering/ogre2/Ogre2RenderTarget.hh
@@ -285,7 +285,7 @@ namespace ignition
       public: virtual void Destroy() override;
 
       // Documentation inherited.
-      public: virtual bool IsRenderWindow() const;
+      public: virtual bool IsRenderWindow() const override;
 
       // Documentation inherited.
       public: virtual Ogre::TextureGpu *RenderTarget() const override;
diff --git a/ogre2/src/Ogre2DepthCamera.cc b/ogre2/src/Ogre2DepthCamera.cc
index 319650a5c..7e7ab6a2a 100644
--- a/ogre2/src/Ogre2DepthCamera.cc
+++ b/ogre2/src/Ogre2DepthCamera.cc
@@ -24,6 +24,7 @@
 #endif
 
 #ifdef __APPLE__
+  #define GL_SILENCE_DEPRECATION
   #include <OpenGL/gl.h>
 #else
 #ifndef _WIN32
diff --git a/ogre2/src/Ogre2ThermalCamera.cc b/ogre2/src/Ogre2ThermalCamera.cc
index bcc0e99f6..29894b315 100644
--- a/ogre2/src/Ogre2ThermalCamera.cc
+++ b/ogre2/src/Ogre2ThermalCamera.cc
@@ -24,6 +24,7 @@
 #endif
 
 #ifdef __APPLE__
+  #define GL_SILENCE_DEPRECATION
   #include <OpenGL/gl.h>
 #else
 #ifndef _WIN32
diff --git a/test/test_config.h.in b/test/test_config.h.in
index b78b67897..a8a651cd7 100644
--- a/test/test_config.h.in
+++ b/test/test_config.h.in
@@ -9,7 +9,12 @@
 #define RENDER_ENGINE_VALUES ::testing::ValuesIn(\
     ignition::rendering::TestValues())
 
+/// \todo(anyone) re-enable ogre2 test once ogre 2.2 works on macOS
+#ifdef __APPLE__
+static const std::vector<const char *> kRenderEngineTestValues{"ogre", "optix"};
+#else
 static const std::vector<const char *> kRenderEngineTestValues{"ogre2", "optix"};
+#endif
 
 #include <vector>
 #include <ignition/common/Util.hh>