Merge 94dbc51 into 993bb0b

gazebosim · Sep 15, 2021 · ce889dd · ce889dd
2 parents 993bb0b + 94dbc51
commit ce889dd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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>