diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cdef0fd0..49af07d85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,7 @@ elseif(CORRADE_TARGET_IOS) option(WITH_WINDOWLESSIOSAPPLICATION "Build WindowlessIosApplication library" OFF) # macOS-specific application libraries -elseif(CORRADE_TARGET_APPLE) +elseif(CORRADE_TARGET_APPLE AND NOT TARGET_GLES) cmake_dependent_option(WITH_WINDOWLESSCGLAPPLICATION "Build WindowlessCglApplication library" OFF "NOT WITH_GL_INFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON) option(WITH_CGLCONTEXT "Build CglContext library" OFF) @@ -310,7 +310,7 @@ if(WITH_OPENGLTESTER) elseif(CORRADE_TARGET_IOS) set(WITH_WINDOWLESSIOSAPPLICATION ON) set(OPENGLTESTER_APPLICATION MagnumWindowlessIosApplication) - elseif(CORRADE_TARGET_APPLE) + elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES) set(WITH_WINDOWLESSCGLAPPLICATION ON) set(OPENGLTESTER_APPLICATION MagnumWindowlessCglApplication) elseif(CORRADE_TARGET_UNIX) diff --git a/doc/generated/CMakeLists.txt b/doc/generated/CMakeLists.txt index 5c5766761..dd8593a2c 100644 --- a/doc/generated/CMakeLists.txt +++ b/doc/generated/CMakeLists.txt @@ -38,7 +38,7 @@ find_package(Magnum REQUIRED set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON) -if(CORRADE_TARGET_APPLE) +if(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES) find_package(Magnum REQUIRED WindowlessCglApplication) elseif(CORRADE_TARGET_UNIX) find_package(Magnum REQUIRED WindowlessGlxApplication) diff --git a/src/Magnum/GL/OpenGLTester.h b/src/Magnum/GL/OpenGLTester.h index 353033e48..a85d1cb8c 100644 --- a/src/Magnum/GL/OpenGLTester.h +++ b/src/Magnum/GL/OpenGLTester.h @@ -41,7 +41,7 @@ #include "Magnum/Platform/WindowlessEglApplication.h" #elif defined(CORRADE_TARGET_IOS) #include "Magnum/Platform/WindowlessIosApplication.h" -#elif defined(CORRADE_TARGET_APPLE) +#elif defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES) #include "Magnum/Platform/WindowlessCglApplication.h" #elif defined(CORRADE_TARGET_UNIX) #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES) diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index e6a474796..cffe52b12 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -675,6 +675,9 @@ if(WITH_WINDOWLESSCGLAPPLICATION) if(NOT TARGET_GL) message(SEND_ERROR "WindowlessCglApplication is available only if TARGET_GL is enabled") endif() + if(TARGET_GLES) + message(SEND_ERROR "WindowlessCglApplication is not available if TARGET_GLES is enabled") + endif() set(NEED_CGLCONTEXT 1) @@ -963,7 +966,7 @@ if(WITH_GL_INFO) target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessEglApplication) elseif(CORRADE_TARGET_IOS) target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessIosApplication) - elseif(CORRADE_TARGET_APPLE) + elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES) target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessCglApplication) elseif(CORRADE_TARGET_UNIX) if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES) diff --git a/src/Magnum/Platform/gl-info.cpp b/src/Magnum/Platform/gl-info.cpp index 951f97d34..b55316d16 100644 --- a/src/Magnum/Platform/gl-info.cpp +++ b/src/Magnum/Platform/gl-info.cpp @@ -63,7 +63,7 @@ #include "Magnum/Platform/WindowlessEglApplication.h" #elif defined(CORRADE_TARGET_IOS) #include "Magnum/Platform/WindowlessIosApplication.h" -#elif defined(CORRADE_TARGET_APPLE) +#elif defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES) #include "Magnum/Platform/WindowlessCglApplication.h" #elif defined(CORRADE_TARGET_UNIX) #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES) diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 3924986c5..5736741d5 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -120,7 +120,7 @@ if(WITH_FONTCONVERTER) target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessEglApplication) elseif(CORRADE_TARGET_IOS) target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessIosApplication) - elseif(CORRADE_TARGET_APPLE) + elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES) target_link_libraries(magnum-fontconverter PRIVATE MagnumWindowlessCglApplication) elseif(CORRADE_TARGET_UNIX) if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES) diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index 285a8a60b..9d4e7cec7 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -88,7 +88,7 @@ if(WITH_DISTANCEFIELDCONVERTER) target_link_libraries(magnum-distancefieldconverter PRIVATE MagnumWindowlessEglApplication) elseif(CORRADE_TARGET_IOS) target_link_libraries(magnum-distancefieldconverter PRIVATE MagnumWindowlessIosApplication) - elseif(CORRADE_TARGET_APPLE) + elseif(CORRADE_TARGET_APPLE AND NOT MAGNUM_TARGET_GLES) target_link_libraries(magnum-distancefieldconverter PRIVATE MagnumWindowlessCglApplication) elseif(CORRADE_TARGET_UNIX) if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES) diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index cc072cf57..8b70a56ca 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -46,7 +46,7 @@ #include "Magnum/Platform/WindowlessEglApplication.h" #elif defined(CORRADE_TARGET_IOS) #include "Magnum/Platform/WindowlessIosApplication.h" -#elif defined(CORRADE_TARGET_APPLE) +#elif defined(CORRADE_TARGET_APPLE) && !defined(MAGNUM_TARGET_GLES) #include "Magnum/Platform/WindowlessCglApplication.h" #elif defined(CORRADE_TARGET_UNIX) #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_DESKTOP_GLES)