diff --git a/cmake/FindGlew.cmake b/cmake/FindGlew.cmake
index 4850512af2..4846eeb152 100644
--- a/cmake/FindGlew.cmake
+++ b/cmake/FindGlew.cmake
@@ -2,13 +2,17 @@
 # Try to find GLEW library and include path.
 # Once done this will define
 #
-# GLEW_FOUND
-# GLEW_INCLUDE_PATH
-# GLEW_LIBRARY
+# GLEW_FOUND - system has GLEW
+# GLEW_INCLUDE_DIR - the GLEW include directories
+# GLEW_LIBRARY - link these to use GLEW
 # 
 
+if(GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
+    set(GLEW_FIND_QUIETLY TRUE)
+endif(GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
+
 IF (WIN32)
-	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
 		$ENV{PROGRAMFILES}/GLEW/include
 		${PROJECT_SOURCE_DIR}/src/nvgl/glew/include
 		DOC "The directory where GL/glew.h resides")
@@ -20,7 +24,7 @@ IF (WIN32)
 		${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
 		DOC "The GLEW library")
 ELSE (WIN32)
-	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
 		/usr/include
 		/usr/local/include
 		/sw/include
@@ -29,19 +33,19 @@ ELSE (WIN32)
 	FIND_LIBRARY( GLEW_LIBRARY
 		NAMES GLEW glew
 		PATHS
-		/usr/lib64
+		/usr/lib32
 		/usr/lib
-		/usr/local/lib64
+		/usr/local/lib32
 		/usr/local/lib
 		/sw/lib
 		/opt/local/lib
 		DOC "The GLEW library")
 ENDIF (WIN32)
 
-IF (GLEW_INCLUDE_PATH)
-	SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-ELSE (GLEW_INCLUDE_PATH)
-	SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-ENDIF (GLEW_INCLUDE_PATH)
+# handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_LIBRARY GLEW_INCLUDE_DIR)
+
+mark_as_advanced(GLEW_LIBRARY GLEW_INCLUDE_DIR)
 
-MARK_AS_ADVANCED( GLEW_FOUND )
\ No newline at end of file
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 412aaf714e..e87f6f7467 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -120,7 +120,7 @@ endif(JPEG_FOUND)
 
 # GLEW
 if(GLEW_FOUND)
-	include_directories(${GLEW_INCLUDE_PATH})
+    include_directories(${GLEW_INCLUDE_DIR})
 endif(GLEW_FOUND)
 
 # OpenGL