Merge pull request #5508 from jherico/marge

Removing integrated glew

cmake/externals/glew/CMakeLists.txt

@@ -0,0 +1,34 @@
+if (WIN32)
+  set(EXTERNAL_NAME glew)
+
+  include(ExternalProject)
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://hifi-public.s3.amazonaws.com/dependencies/glew-1.10.0-win32.zip
+    URL_MD5 37514e4e595a3b3dc587eee8f7e8ec2f
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD 1
+  )
+
+  # Hide this external target (for ide users)
+  set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+  string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE PATH "List of glew include directories")
+
+  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(_LIB_DIR ${SOURCE_DIR}/lib/Release/x64)
+    set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${SOURCE_DIR}/bin/Release/x64 CACHE FILEPATH "Location of GLEW DLL")
+  else()
+    set(_LIB_DIR ${SOURCE_DIR}/lib/Release/Win32)
+    set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${SOURCE_DIR}/bin/Release/Win32 CACHE FILEPATH "Location of GLEW DLL")
+  endif()
+
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${_LIB_DIR}/glew32.lib CACHE FILEPATH "Location of GLEW release library")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Location of GLEW debug library")
+
+endif ()

cmake/modules/FindGLEW.cmake

@@ -0,0 +1,56 @@
+#
+#  FindGLEW.cmake
+# 
+#  Try to find GLEW library and include path.
+#  Once done this will define
+#
+#  GLEW_FOUND
+#  GLEW_INCLUDE_DIRS
+#  GLEW_LIBRARIES
+# 
+#  Created on 2/6/2014 by Stephen Birarda
+#  Copyright 2014 High Fidelity, Inc.
+#
+#  Adapted from FindGLEW.cmake available in the nvidia-texture-tools repository
+#  (https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/cmake/FindGLEW.cmake?r=96)
+# 
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+if (WIN32)
+  include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+  hifi_library_search_hints("glew")
+  
+  find_path(GLEW_INCLUDE_DIRS GL/glew.h PATH_SUFFIXES include HINTS ${GLEW_SEARCH_DIRS})
+  
+  find_library(GLEW_LIBRARY_RELEASE glew32 PATH_SUFFIXES "lib/Release/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+  find_library(GLEW_LIBRARY_DEBUG glew32d PATH_SUFFIXES "lib/Debug/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+  
+  find_path(GLEW_DLL_PATH glew32.dll PATH_SUFFIXES "bin/Release/Win32" HINTS ${GLEW_SEARCH_DIRS})
+  
+  include(SelectLibraryConfigurations)
+  select_library_configurations(GLEW)
+  
+  set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES GLEW_DLL_PATH)
+  
+  add_paths_to_fixup_libs(${GLEW_DLL_PATH})
+elseif (APPLE)
+else ()
+   find_path(GLEW_INCLUDE_DIR GL/glew.h)
+    find_library(GLEW_LIBRARY NAMES GLEW glew32 glew glew32s PATH_SUFFIXES lib64)
+
+    set(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
+    set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(GLEW
+                                  REQUIRED_VARS GLEW_INCLUDE_DIR GLEW_LIBRARY)
+
+    mark_as_advanced(GLEW_INCLUDE_DIR GLEW_LIBRARY)
+ 
+endif ()
+

libraries/gpu/CMakeLists.txt

@@ -7,15 +7,18 @@ setup_hifi_library()
 
 link_hifi_libraries(shared)
 
+add_dependency_external_projects(glew)
+find_package(GLEW REQUIRED)
+add_definitions(-DGLEW_STATIC) 
+target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES})
+
 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_definitions(-DGLEW_STATIC) 
-
-  target_link_libraries(${TARGET_NAME} opengl32.lib)
+  target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} opengl32.lib)
 
   if (USE_NSIGHT)
     # try to find the Nsight package and add it to the build if we find it
@@ -38,5 +41,4 @@ else ()
   endif ()
 
   target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
-
 endif (APPLE)