[Bf-blender-cvs] [4d35731] soc-2014-viewport_context: Minor improvements to finding opengles libs
Campbell Barton
noreply at git.blender.org
Wed Jul 30 12:48:55 CEST 2014
Commit: 4d35731bcbb4417594ba5441fc06be1144ede44f
Author: Campbell Barton
Date: Wed Jul 30 20:48:28 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rB4d35731bcbb4417594ba5441fc06be1144ede44f
Minor improvements to finding opengles libs
===================================================================
M build_files/cmake/Modules/FindOpenGLES.cmake
===================================================================
diff --git a/build_files/cmake/Modules/FindOpenGLES.cmake b/build_files/cmake/Modules/FindOpenGLES.cmake
index 981a1ab..1bb06c2 100644
--- a/build_files/cmake/Modules/FindOpenGLES.cmake
+++ b/build_files/cmake/Modules/FindOpenGLES.cmake
@@ -10,42 +10,67 @@
# OPENGLES_LIBRARIES - all libraries needed for OpenGLES
# OPENGLES_INCLUDES - all includes needed for OpenGLES
-FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h
- /usr/openwin/share/include
- /opt/graphics/OpenGL/include /usr/X11R6/include
- /usr/include
+# If OPENGLES_ROOT_DIR was defined in the environment, use it.
+IF(NOT OPENGLES_ROOT_DIR AND NOT $ENV{OPENGLES_ROOT_DIR} STREQUAL "")
+ SET(OPENGLES_ROOT_DIR $ENV{OPENGLES_ROOT_DIR})
+ENDIF()
+
+SET(_opengles_SEARCH_DIRS
+ ${OPENGLES_ROOT_DIR}
+ /usr/local
+)
+
+FIND_PATH(OPENGLES_INCLUDE_DIR
+ NAMES
+ GLES2/gl2.h
+ HINTS
+ ${_opengles_SEARCH_DIRS}
)
FIND_LIBRARY(OPENGLES_LIBRARY
- NAMES GLESv2
- PATHS /opt/graphics/OpenGL/lib
- /usr/openwin/lib
- /usr/shlib /usr/X11R6/lib
- /usr/lib
+ NAMES
+ GLESv2
+ PATHS
+ ${_opengles_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
-FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h
- /usr/openwin/share/include
- /opt/graphics/OpenGL/include /usr/X11R6/include
- /usr/include
+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR
+ NAMES
+ EGL/egl.h
+ HINTS
+ ${_opengles_SEARCH_DIRS}
)
FIND_LIBRARY(OPENGLES_EGL_LIBRARY
- NAMES EGL
- PATHS /usr/shlib /usr/X11R6/lib
- /usr/lib
+ NAMES
+ EGL
+ HINTS
+ ${_opengles_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
-SET(OPENGL_EGL_FOUND "NO")
IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
- SET(OPENGL_EGL_FOUND "YES")
+ SET(OPENGL_EGL_FOUND "YES")
+ELSE()
+ SET(OPENGL_EGL_FOUND "NO")
ENDIF()
-SET(OPENGLES_FOUND "NO")
IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
- SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
+ SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
${OPENGLES_EGL_LIBRARY})
- SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
- SET(OPENGLES_FOUND "YES")
+ SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
+ SET(OPENGLES_FOUND "YES")
+ELSE()
+ SET(OPENGLES_FOUND "NO")
ENDIF()
+
+MARK_AS_ADVANCED(
+ OPENGLES_EGL_INCLUDE_DIR
+ OPENGLES_EGL_LIBRARY
+ OPENGLES_INCLUDE_DIR
+)
+
More information about the Bf-blender-cvs
mailing list