diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96a99ad0d..d94148287 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -369,11 +369,6 @@ if(_MAGNUM_ACCEPT_DEPRECATED_UNPREFIXED_OPTIONS AND MAGNUM_BUILD_DEPRECATED)
     # Doing this before propagating the unprefixed options to avoid a
     # false-positive warning when e.g. MAGNUM_BUILD_STATIC_PIC is implicitly ON
     # but BUILD_STATIC_PIC not yet.
-    if(CORRADE_TARGET_IOS OR CORRADE_TARGET_ANDROID OR CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_WINDOWS_RT)
-        if(NOT DEFINED TARGET_GLES)
-            set(TARGET_GLES ON)
-        endif()
-    endif()
     if(TARGET_GLES)
         if(NOT DEFINED TARGET_GLES2)
             set(TARGET_GLES2 ON)
@@ -426,7 +421,7 @@ if(_MAGNUM_ACCEPT_DEPRECATED_UNPREFIXED_OPTIONS AND MAGNUM_BUILD_DEPRECATED)
             if(NOT DEFINED WITH_WINDOWLESSIOSAPPLICATION)
                 set(WITH_WINDOWLESSIOSAPPLICATION ON)
             endif()
-        elseif(CORRADE_TARGET_APPLE AND NOT TARGET_GLES)
+        elseif(CORRADE_TARGET_APPLE AND NOT TARGET_GLES AND NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_WINDOWS_RT)
             if(NOT DEFINED WITH_WINDOWLESSCGLAPPLICATION)
                 set(WITH_WINDOWLESSCGLAPPLICATION ON)
             endif()
@@ -434,7 +429,7 @@ if(_MAGNUM_ACCEPT_DEPRECATED_UNPREFIXED_OPTIONS AND MAGNUM_BUILD_DEPRECATED)
             # Checking the old deprecated options here, checking
             # MAGNUM_TARGET_EGL wouldn't make sense as that's an option the
             # old code definitely won't use.
-            if((NOT TARGET_GLES AND NOT TARGET_HEADLESS) OR TARGET_DESKTOP_GLES)
+            if((NOT TARGET_GLES AND NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_WINDOWS_RT AND NOT TARGET_HEADLESS) OR TARGET_DESKTOP_GLES)
                 if(NOT DEFINED WITH_WINDOWLESSGLXAPPLICATION)
                     set(WITH_WINDOWLESSGLXAPPLICATION ON)
                 endif()
@@ -444,7 +439,7 @@ if(_MAGNUM_ACCEPT_DEPRECATED_UNPREFIXED_OPTIONS AND MAGNUM_BUILD_DEPRECATED)
                 endif()
             endif()
         elseif(CORRADE_TARGET_WINDOWS)
-            if(NOT TARGET_GLES OR TARGET_DESKTOP_GLES)
+            if((NOT TARGET_GLES AND NOT CORRADE_TARGET_IOS AND NOT CORRADE_TARGET_ANDROID AND NOT CORRADE_TARGET_EMSCRIPTEN AND NOT CORRADE_TARGET_WINDOWS_RT) OR TARGET_DESKTOP_GLES)
                 if(NOT DEFINED WITH_WINDOWLESSWGLAPPLICATION)
                     set(WITH_WINDOWLESSWGLAPPLICATION ON)
                 endif()