From 7c2fea459877aedd102667686f7a90db9ad6ee3b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 31 Aug 2016 11:03:53 -0700
Subject: [PATCH] remove glew/oglplus requirement for android interface

---
 cmake/externals/glew/CMakeLists.txt      | 3 +--
 interface/CMakeLists.txt                 | 5 ++++-
 libraries/display-plugins/CMakeLists.txt | 4 +++-
 libraries/gl/CMakeLists.txt              | 7 +++++--
 libraries/gpu-gl/CMakeLists.txt          | 7 +++++--
 libraries/render-utils/CMakeLists.txt    | 6 ++++--
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/cmake/externals/glew/CMakeLists.txt b/cmake/externals/glew/CMakeLists.txt
index c9ad5f837a..28a599bfa6 100644
--- a/cmake/externals/glew/CMakeLists.txt
+++ b/cmake/externals/glew/CMakeLists.txt
@@ -15,7 +15,6 @@ ExternalProject_Add(
   LOG_BUILD 1
 )
 
-
 # Hide this external target (for ide users)
 set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
 
@@ -32,4 +31,4 @@ elseif (WIN32)
 endif ()
 
 set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/${LIB_PREFIX}glew_d.${LIB_EXT} CACHE FILEPATH "Path to glew debug library")
-set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/${LIB_PREFIX}glew.${LIB_EXT} CACHE FILEPATH "Path to glew release library")
\ No newline at end of file
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/${LIB_PREFIX}glew.${LIB_EXT} CACHE FILEPATH "Path to glew release library")
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 37e084b4b4..b90533e2b7 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -185,9 +185,12 @@ target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries
 
 #fixme find a way to express faceshift as a plugin
 target_bullet()
-target_glew()
 target_opengl()
 
+if (NOT ANDROID)
+  target_glew()
+endif ()
+
 if (WIN32 OR APPLE)
   target_faceshift()
 endif()
diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt
index 315e7510a5..5621a9c7b0 100644
--- a/libraries/display-plugins/CMakeLists.txt
+++ b/libraries/display-plugins/CMakeLists.txt
@@ -7,4 +7,6 @@ target_opengl()
 
 GroupSources("src/display-plugins")
 
-target_oglplus()
+if (NOT ANDROID)
+  target_oglplus()
+endif ()
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index f60e41739a..0c29bf691a 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -2,6 +2,9 @@ set(TARGET_NAME gl)
 setup_hifi_library(OpenGL Qml Quick)
 link_hifi_libraries(shared)
 
-target_glew()
 target_opengl()
-target_oglplus()
\ No newline at end of file
+
+if (NOT ANDROID)
+  target_glew()
+  target_oglplus()
+endif ()
diff --git a/libraries/gpu-gl/CMakeLists.txt b/libraries/gpu-gl/CMakeLists.txt
index 398fdd04d6..320f9b3c71 100644
--- a/libraries/gpu-gl/CMakeLists.txt
+++ b/libraries/gpu-gl/CMakeLists.txt
@@ -3,5 +3,8 @@ setup_hifi_library()
 link_hifi_libraries(shared gl gpu)
 GroupSources("src")
 
-target_glew()
-target_opengl()
\ No newline at end of file
+target_opengl()
+
+if (NOT ANDROID)
+  target_glew()
+endif ()
diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt
index 7b272f7b7d..380c7dc611 100644
--- a/libraries/render-utils/CMakeLists.txt
+++ b/libraries/render-utils/CMakeLists.txt
@@ -5,5 +5,7 @@ qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts
 setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
 link_hifi_libraries(shared gpu model model-networking render animation fbx)
 
-target_nsight()
-target_oglplus()
+if (NOT ANDROID)
+  target_nsight()
+  target_oglplus()
+endif ()