From 79d9fdba3256cf7e60d6d00e92b0f46160bcf45b Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sat, 18 Feb 2012 16:57:24 +0100
Subject: GLEW fix: Support GLEW installed in the default system location


diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ad3eefe..c395a52 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -239,15 +239,14 @@ if (NOT GLEW_INCLUDE_DIR)
                NAMES GLEW glew
                HINTS ${GLEW_DIR}/lib
 	       NO_DEFAULT_PATH)
-  if (NOT GLEW_INCLUDE_DIR OR NOT GLEW_LIBRARY)
+  if (NOT GLEW_LIBRARY)
     find_package(GLEW REQUIRED)
-    if (NOT GLEW_INCLUDE_DIR OR NOT GLEW_LIBRARY)
+    if (NOT GLEW_LIBRARY)
       message(FATAL_ERROR "GLEW not found")
     endif()
-  else()
-    message(STATUS "GLEW include found in " ${GLEW_INCLUDE_DIR})
-    message(STATUS "GLEW library found in " ${GLEW_LIBRARY})
   endif()
+  message(STATUS "GLEW include: " ${GLEW_INCLUDE_DIR})
+  message(STATUS "GLEW library: " ${GLEW_LIBRARY})
 endif()
 
 inclusion(GLEW_DIR GLEW_INCLUDE_DIR)
diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake
index b7e37d0..a503368 100644
--- a/tests/FindGLEW.cmake
+++ b/tests/FindGLEW.cmake
@@ -17,9 +17,9 @@ if (PKG_CONFIG_FOUND)
   pkg_check_modules(GLEW glew>=1.5)
 endif()
 
-if (GLEW_FOUND)
-  set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS})  
-  set(GLEW_LIBRARY ${GLEW_LDFLAGS})  
+if (GLEW_LIBRARIES)
+  set(GLEW_INCLUDE_DIR "${GLEW_INCLUDE_DIRS}")
+  set(GLEW_LIBRARY ${GLEW_LDFLAGS})
 else()
   if (WIN32 AND MSVC)
     if (WIN32_STATIC_BUILD) # passed from caller
-- 
cgit v0.10.1