Browse Source

Don't try to find OpenGL ES more times than necessary.

vectorfields
Vladimír Vondruš 14 years ago
parent
commit
7e62a19401
  1. 1
      modules/FindMagnum.cmake
  2. 5
      src/Contexts/CMakeLists.txt

1
modules/FindMagnum.cmake

@ -92,7 +92,6 @@ foreach(component ${Magnum_FIND_COMPONENTS})
# X/EGL context dependencies
if(${component} STREQUAL EglContext)
find_package(OpenGLES2)
find_package(EGL)
find_package(X11)
if(NOT OPENGLES2_FOUND OR NOT EGL_FOUND OR NOT X11_FOUND)

5
src/Contexts/CMakeLists.txt

@ -27,14 +27,13 @@ endif()
# X/EGL context
if(WITH_EGLCONTEXT)
find_package(OpenGLES2)
find_package(EGL)
find_package(X11)
if(OPENGLES2_FOUND AND EGL_FOUND AND X11_FOUND)
if(EGL_FOUND AND X11_FOUND)
add_library(MagnumEglContext STATIC EglContext.cpp)
install(FILES EglContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts)
install(TARGETS MagnumEglContext DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
else()
message(FATAL_ERROR "OpenGL ES 2, EGL or X11 libraries, required by EglContext, were not found. Set WITH_EGLCONTEXT to OFF to skip building it.")
message(FATAL_ERROR "EGL or X11 libraries, required by EglContext, were not found. Set WITH_EGLCONTEXT to OFF to skip building it.")
endif()
endif()

Loading…
Cancel
Save