Trying to fixup the plugins compilation

libraries/display-plugins/CMakeLists.txt

@@ -26,7 +26,7 @@ find_package(LibOVR REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${LIBOVR_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES})
 
-if (!APPLE)
+if (NOT(APPLE))
   add_dependency_external_projects(OpenVR)
   find_package(OpenVR REQUIRED)
   target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS})

libraries/gpu/CMakeLists.txt

@@ -7,24 +7,18 @@ setup_hifi_library()
 
 link_hifi_libraries(shared)
 
-if(ANDROID)
-
-  target_link_libraries(${TARGET_NAME} "-lGLESv3" "-lEGL")
-
-else()
+if (APPLE)
+  # link in required OS X frameworks and include the right GL headers
+  find_library(OpenGL OpenGL)
 
+  target_link_libraries(${TARGET_NAME} ${OpenGL})
+elseif (WIN32)
   add_dependency_external_projects(glew)
   find_package(GLEW REQUIRED)
   target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
-  
-  target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES})
 
-  find_package(OpenGL REQUIRED)
-  target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
+  target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} opengl32.lib)
 
-endif()
-
-if (WIN32)
   if (USE_NSIGHT)
     # try to find the Nsight package and add it to the build if we find it
     find_package(NSIGHT)
@@ -34,4 +28,16 @@ if (WIN32)
       target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
     endif ()
   endif()
-endif ()
+elseif (ANDROID)
+  target_link_libraries(${TARGET_NAME} "-lGLESv3" "-lEGL")
+else ()
+  find_package(OpenGL REQUIRED)
+  
+  if (${OPENGL_INCLUDE_DIR})
+    include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
+  endif ()
+  
+  target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
+  
+  target_include_directories(${TARGET_NAME} PUBLIC ${OPENGL_INCLUDE_DIR})
+endif (APPLE)

libraries/gpu/src/gpu/GPUConfig.h

@@ -12,7 +12,7 @@
 #ifndef gpu__GPUConfig__
 #define gpu__GPUConfig__
 
-#include "../GL/glew.h"
+#include <GL/glew.h>
 
 #define GL_GLEXT_PROTOTYPES 1
 
@@ -26,7 +26,7 @@
 
 #elif defined(WIN32)
 #include <windowshacks.h>
-#include "../GL/wglew.h"
+#include <GL/wglew.h>
 
 #define GPU_FEATURE_PROFILE GPU_CORE
 #define GPU_TRANSFORM_PROFILE GPU_CORE