From 7e62a19401d0e30efb0ee849936447b3219529a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 19 Jul 2012 15:57:13 +0200 Subject: [PATCH] Don't try to find OpenGL ES more times than necessary. --- modules/FindMagnum.cmake | 1 - src/Contexts/CMakeLists.txt | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index f4cddbe73..772ca9043 100644 --- a/modules/FindMagnum.cmake +++ b/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) diff --git a/src/Contexts/CMakeLists.txt b/src/Contexts/CMakeLists.txt index c0e5eef45..2ac978d58 100644 --- a/src/Contexts/CMakeLists.txt +++ b/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()