From f7888cb7c90b2d3fe7d887795f03d653783b212d Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 May 2012 16:23:48 +0200 Subject: [PATCH] Changed: #1275 Added OpenGL ES CMake module --- code/CMakeModules/FindOpenGLES.cmake | 49 +++++++++++++++++++ code/nel/CMakeLists.txt | 13 ----- code/nel/src/3d/driver/opengl/CMakeLists.txt | 12 +++++ .../nel/src/3d/driver/opengles/CMakeLists.txt | 2 +- 4 files changed, 62 insertions(+), 14 deletions(-) create mode 100644 code/CMakeModules/FindOpenGLES.cmake diff --git a/code/CMakeModules/FindOpenGLES.cmake b/code/CMakeModules/FindOpenGLES.cmake new file mode 100644 index 000000000..35157b95b --- /dev/null +++ b/code/CMakeModules/FindOpenGLES.cmake @@ -0,0 +1,49 @@ +# - Try to find OpenGL ES +# Once done this will define +# +# OPENGLES_FOUND - system has OpenGL ES +# OPENGLES_EGL_FOUND - system has EGL +# OPENGLES_LIBRARIES - Link these to use OpenGL ES and EGL +# +# If you want to use just GL ES you can use these values +# OPENGLES_GLES_LIBRARY - Path to OpenGL ES Library +# OPENGLES_EGL_LIBRARY - Path to EGL Library + +FIND_LIBRARY(OPENGLES_GLES_LIBRARY + NAMES GLESv1_CM libGLESv1_CM gles_cm libgles_cm + PATHS + /usr/local/lib + /usr/lib + /usr/local/X11R6/lib + /usr/X11R6/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 +) + +FIND_LIBRARY(OPENGLES_EGL_LIBRARY + NAMES EGL libEGL + PATHS + /usr/local/lib + /usr/lib + /usr/local/X11R6/lib + /usr/X11R6/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64 +) + +IF(OPENGLES_GLES_LIBRARY) + SET(OPENGLES_FOUND "YES") + SET(OPENGLES_LIBRARIES ${OPENGLES_GLES_LIBRARY} ${OPENGLES_LIBRARIES}) + IF(OPENGLES_EGL_LIBRARY) + SET(OPENGLES_EGL_FOUND "YES") + SET(OPENGLES_LIBRARIES ${OPENGLES_EGL_LIBRARY} ${OPENGLES_LIBRARIES}) + ELSE(OPENGLES_EGL_LIBRARY) + SET(OPENGLES_EGL_FOUND "NO") + ENDIF(OPENGLES_EGL_LIBRARY) +ENDIF(OPENGLES_GLES_LIBRARY) diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index 57f7edd44..f71bb7826 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -18,19 +18,6 @@ ENDIF(WIN32) IF(WITH_3D) FIND_PACKAGE(FreeType) - IF(WITH_DRIVER_OPENGL) - FIND_PACKAGE(OpenGL) - IF(NOT WIN32) - IF(APPLE) - FIND_LIBRARY(CARBON NAMES Carbon) - FIND_LIBRARY(COCOA NAMES Cocoa) - ELSE(APPLE) - FIND_PACKAGE(X11) - FIND_PACKAGE(XF86VidMode) - ENDIF(APPLE) - ENDIF(NOT WIN32) - ENDIF(WITH_DRIVER_OPENGL) - IF(WITH_NEL_CEGUI) FIND_PACKAGE(CEGUI) ENDIF(WITH_NEL_CEGUI) diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt index 0c2a83588..2d1f092b5 100644 --- a/code/nel/src/3d/driver/opengl/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt @@ -1,3 +1,15 @@ +FIND_PACKAGE(OpenGL REQUIRED) + +IF(NOT WIN32) + IF(APPLE) + FIND_LIBRARY(CARBON NAMES Carbon) + FIND_LIBRARY(COCOA NAMES Cocoa) + ELSE(APPLE) + FIND_PACKAGE(X11) + FIND_PACKAGE(XF86VidMode) + ENDIF(APPLE) +ENDIF(NOT WIN32) + FILE(GLOB SRC *.cpp *.h *.def) IF(APPLE) diff --git a/code/nel/src/3d/driver/opengles/CMakeLists.txt b/code/nel/src/3d/driver/opengles/CMakeLists.txt index 86b775f8b..949d91a32 100644 --- a/code/nel/src/3d/driver/opengles/CMakeLists.txt +++ b/code/nel/src/3d/driver/opengles/CMakeLists.txt @@ -1,4 +1,4 @@ -FIND_PACKAGE(OpenGLES) +FIND_PACKAGE(OpenGLES REQUIRED) IF(NOT WIN32) IF(APPLE)