From 8ba82649dfd7584902dfb2945e1b28d0a92e53b6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 7 Mar 2014 10:57:11 -0800
Subject: [PATCH] pick the correct arch for GLEW on windows

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

diff --git a/cmake/modules/FindGLEW.cmake b/cmake/modules/FindGLEW.cmake
index 46b5e794d3..b0f798a78a 100644
--- a/cmake/modules/FindGLEW.cmake
+++ b/cmake/modules/FindGLEW.cmake
@@ -14,16 +14,22 @@
 
 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")
+    "${GLEW_ROOT_DIR}/include"
+    "$ENV{GLEW_ROOT_DIR}/include"
+	  "$ENV{HIFI_LIB_DIR}/glew/include"
+	  DOC "The directory where GL/glew.h resides")
+  if (CMAKE_CL_64)
+    set(WIN_ARCH_DIR "x64")
+  else()
+    set(LINUX_ARCH_DIR "Win32")
+  endif()
+	
 	FIND_LIBRARY(GLEW_LIBRARY
 		NAMES glew GLEW glew32 glew32s
 		PATHS
-        ${GLEW_ROOT_DIR}/lib
-        $ENV{GLEW_ROOT_DIR}/include
-		$ENV{HIFI_LIB_DIR}/glew/lib
+    "${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")
 ENDIF()