[Bf-blender-cvs] [dfccfeb] master: CMake: add glew-mx library

Campbell Barton noreply at git.blender.org
Mon Jul 28 19:53:51 CEST 2014


Commit: dfccfeb447b4d59f2326a0af9ca5d550e2eb38fc
Author: Campbell Barton
Date:   Tue Jul 29 03:53:15 2014 +1000
Branches: master
https://developer.blender.org/rBdfccfeb447b4d59f2326a0af9ca5d550e2eb38fc

CMake: add glew-mx library

===================================================================

M	build_files/cmake/Modules/FindGLEW.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake
index 551a7aa..8589e14 100644
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -3,13 +3,13 @@
 # This module defines
 #  GLEW_INCLUDE_DIRS, where to find glew.h, Set when
 #                        GLEW_INCLUDE_DIR is found.
-#  GLEW_LIBRARIES, libraries to link against to use Glew.
 #  GLEW_ROOT_DIR, The base directory to search for Glew.
 #                    This can also be an environment variable.
 #  GLEW_FOUND, If false, do not try to use Glew.
 #
-# also defined, but not for general use are
+# also defined,
 #  GLEW_LIBRARY, where to find the Glew library.
+#  GLEW_MX_LIBRARY, where to find the GlewMX library.
 
 #=============================================================================
 # Copyright 2014 Blender Foundation.
@@ -50,6 +50,16 @@ FIND_LIBRARY(GLEW_LIBRARY
     lib64 lib
   )
 
+
+FIND_LIBRARY(GLEW_MX_LIBRARY
+  NAMES
+    GLEWmx
+  HINTS
+    ${_glew_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
 # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -57,11 +67,11 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Glew DEFAULT_MSG
     GLEW_LIBRARY GLEW_INCLUDE_DIR)
 
 IF(GLEW_FOUND)
-  SET(GLEW_LIBRARIES ${GLEW_LIBRARY})
   SET(GLEW_INCLUDE_DIRS ${GLEW_INCLUDE_DIR})
 ENDIF(GLEW_FOUND)
 
 MARK_AS_ADVANCED(
   GLEW_INCLUDE_DIR
   GLEW_LIBRARY
+  GLEW_MX_LIBRARY
 )




More information about the Bf-blender-cvs mailing list