Updated FindGLEW.cmake, fixed Windows support.

On Win it needs both *.dll and *.lib to be successfully linked,
currently the variables must be set manually.

modules/FindGLEW.cmake

@@ -3,33 +3,41 @@
 # This module defines:
 #
 # GLEW_FOUND                - True if GLEW library is found
-# GLEW_LIBRARY              - GLEW dynamic library
+# GLEW_LIBRARIES            - GLEW libraries
 # GLEW_INCLUDE_DIR          - Include dir
 #
 
-if(GLEW_LIBRARY AND GLEW_INCLUDE_DIR)
+# Include dir
-
+find_path(GLEW_INCLUDE_DIR
-    set(GLEW_FOUND TRUE)
+    NAMES GL/glew.h)
 
+# Library
+if(NOT WIN32)
+    find_library(GLEW_LIBRARY GLEW)
+    set(GLEW_LIBRARIES_ GLEW_LIBRARY)
+    mark_as_advanced(GLEW_LIBRARY)
 else()
+    find_library(GLEW_LIBRARY_DLL glew32)
+    find_library(GLEW_LIBRARY_LIB glew32)
+    set(GLEW_LIBRARIES_ GLEW_LIBRARY_DLL GLEW_LIBRARY_LIB)
+    mark_as_advanced(GLEW_LIBRARY_DLL GLEW_LIBRARY_LIB)
+endif()
 
-    # Library
+include(FindPackageHandleStandardArgs)
-    if(NOT WIN32)
+find_package_handle_standard_args("GLEW" DEFAULT_MSG
-        find_library(GLEW_LIBRARY GLEW)
+    ${GLEW_LIBRARIES_}
-    else()
+    GLEW_INCLUDE_DIR)
-        find_library(GLEW_LIBRARY glew32)
-    endif()
 
-    # Include dir
+if(NOT GLEW_FOUND)
-    find_path(GLEW_INCLUDE_DIR
+    return()
-        NAMES glew.h
+endif()
-        PATH_SUFFIXES GL
-    )
 
-    include(FindPackageHandleStandardArgs)
+unset(GLEW_LIBRARIES_)
-    find_package_handle_standard_args("GLEW" DEFAULT_MSG
-        GLEW_LIBRARY
-        GLEW_INCLUDE_DIR
-    )
 
+if(NOT WIN32)
+    set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+    mark_as_advanced(GLEW_LIBRARY)
+else()
+    set(GLEW_LIBRARIES ${GLEW_LIBRARY_DLL} ${GLEW_LIBRARY_LIB})
+    mark_as_advanced(GLEW_LIBRARY_DLL GLEW_LIBRARY_LIB)
 endif()

modules/FindMagnum.cmake

@@ -262,7 +262,7 @@ else()
     set(MAGNUM_LIBRARIES ${MAGNUM_LIBRARIES} ${OPENGLES2_LIBRARY})
 endif()
 if(NOT MAGNUM_TARGET_GLES)
-    set(MAGNUM_LIBRARIES ${MAGNUM_LIBRARIES} ${GLEW_LIBRARY})
+    set(MAGNUM_LIBRARIES ${MAGNUM_LIBRARIES} ${GLEW_LIBRARIES})
 endif()
 
 # Installation dirs

src/CMakeLists.txt

@@ -124,7 +124,7 @@ else()
     set(Magnum_LIBS ${Magnum_LIBS} ${OPENGLES2_LIBRARY})
 endif()
 if(NOT TARGET_GLES)
-    set(Magnum_LIBS ${Magnum_LIBS} ${GLEW_LIBRARY})
+    set(Magnum_LIBS ${Magnum_LIBS} ${GLEW_LIBRARIES})
 endif()
 target_link_libraries(Magnum ${Magnum_LIBS})