Merge branch 'feature/openeb-updates' of https://github.com/emsight/o…

…peneb into emsight-feature/openeb-updates

CMakeLists.txt

@@ -15,6 +15,8 @@ if(NOT CMAKE_BUILD_TYPE)
         "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
+option(BUILD_TESTING "Build OpenEB's test suite" OFF)
+
 cmake_minimum_required(VERSION 3.5)
 
 project(metavision VERSION 5.0.0)

sdk/modules/stream/cpp/src/camera_serialization.cpp

@@ -703,7 +703,11 @@ std::ostream &save_device(const Device &d, std::ostream &os) {
 
     google::protobuf::util::JsonPrintOptions options;
     options.add_whitespace                = true;
+    #if (GOOGLE_PROTOBUF_VERSION >= 5026000)
+    options.always_print_fields_with_no_presence = true;
+    #else
     options.always_print_primitive_fields = true;
+    #endif
     options.preserve_proto_field_names    = true;
 
     std::string json;

sdk/modules/ui/cpp/include/metavision/sdk/ui/utils/opengl_api.h

@@ -14,18 +14,27 @@
 
 #ifdef _USE_OPENGL_ES3_
 #include <GLES3/gl3.h>
+#elif defined(__APPLE__) && !defined(__linux__)
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/gl3.h>
+#else
+#if defined(WIN32)
+#include <Windows.h>
+#endif
+#include <GL/glew.h>
+#include <GL/gl.h>
+#endif
+
+// GLFW needs to be included after OpenGL
+#include <GLFW/glfw3.h>
+
 // While we keep support for OpenGL, we need to provide a
 // dummy implementation for Glew init function
+#ifndef GLEW_OK
 #define GLEW_OK 0
 inline int glewInit(void) {
     return GLEW_OK;
 }
-#else // OpenGL
-#include <GL/glew.h>
-#include <GL/gl.h>
 #endif
 
-// GLFW need to be included after OpenGL
-#include <GLFW/glfw3.h>
-
 #endif // METAVISION_SDK_UI_UTILS_OPENGL_API