From 46e575838bd378076f3ff3314145e2f1592af380 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 7 Mar 2014 11:45:05 -0800
Subject: [PATCH] simplify GLEW find module for Win32

---
 cmake/modules/FindGLEW.cmake | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/cmake/modules/FindGLEW.cmake b/cmake/modules/FindGLEW.cmake
index 3002faa788..bd609dae9c 100644
--- a/cmake/modules/FindGLEW.cmake
+++ b/cmake/modules/FindGLEW.cmake
@@ -15,13 +15,10 @@
 if (GLEW_INCLUDE_DIRS AND GLEW_LIBRARY)
   set(GLEW_FOUND TRUE)
 else ()
-  if (WIN32)    
-  	find_path(GLEW_INCLUDE_DIRS GL/glew.h
-      "${GLEW_ROOT_DIR}/include"
-      "$ENV{GLEW_ROOT_DIR}/include"
-  	  "$ENV{HIFI_LIB_DIR}/glew/include"
-  	  DOC "The directory where GL/glew.h resides"
-    )
+  if (WIN32)
+    set(WIN_GLEW_SEARCH_DIRS "${GLEW_ROOT_DIR}" "$ENV{GLEW_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/glew")
+       
+  	find_path(GLEW_INCLUDE_DIRS include/GL/glew.h HINTS ${WIN_GLEW_SEARCH_DIRS})
   
     if (CMAKE_CL_64)
       set(WIN_ARCH_DIR "x64")
@@ -29,14 +26,7 @@ else ()
       set(WIN_ARCH_DIR "Win32")
     endif()
 	
-  	find_library(GLEW_LIBRARY
-  		NAMES glew GLEW glew32 glew32s
-  		PATHS
-      "${GLEW_ROOT_DIR}/lib/Release/${WIN_ARCH_DIR}"
-      "$ENV{GLEW_ROOT_DIR}/lib/Release/${WIN_ARCH_DIR}"
-  		"$ENV{HIFI_LIB_DIR}/glew/lib/Release/${WIN_ARCH_DIR}"
-  		DOC "The GLEW library"
-    )
+  	find_library(GLEW_LIBRARY "lib/Release/${WIN_ARCH_DIR}/glew32" HINTS ${WIN_GLEW_SEARCH_DIRS})
   endif ()
 
   include(FindPackageHandleStandardArgs)