Split the OpenGL layer out, pt 7: renamed magnum-info to magnum-gl-info.

The WITH_MAGNUMINFO CMake option is now WITH_GL_INFO. No backwards
compatibility is provided, sorry.

CMakeLists.txt

@@ -73,10 +73,10 @@ cmake_dependent_option(TARGET_GLES2 "Build for OpenGL ES 2 / WebGL 1.0" ON "TARG
 cmake_dependent_option(TARGET_DESKTOP_GLES "Build for OpenGL ES on desktop" OFF "TARGET_GLES" OFF)
 cmake_dependent_option(TARGET_HEADLESS "Build command-line utilities for use on a headless machines" OFF "WITH_GL" OFF)
 
-# Magnum Info (currently only using GLX/CGL/EGL on *nix, WGL/EGL on Windows and
+# Magnum GL Info (currently only using GLX/CGL/EGL on *nix, WGL/EGL on Windows
-# EGL on Emscripten)
+# and EGL on Emscripten)
 if(CORRADE_TARGET_UNIX OR CORRADE_TARGET_WINDOWS OR CORRADE_TARGET_EMSCRIPTEN)
-    option(WITH_MAGNUMINFO "Build magnum-info utility" OFF)
+    option(WITH_GL_INFO "Build magnum-gl-info utility" OFF)
 endif()
 
 # Desktop-only utilities
@@ -114,7 +114,7 @@ cmake_dependent_option(WITH_SHADERS "Build Shaders library" ON "NOT WITH_DEBUGTO
 cmake_dependent_option(WITH_TEXT "Build Text library" ON "NOT WITH_FONTCONVERTER;NOT WITH_MAGNUMFONT;NOT WITH_MAGNUMFONTCONVERTER" ON)
 cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" ON "NOT WITH_TEXT;NOT WITH_DISTANCEFIELDCONVERTER" ON)
 cmake_dependent_option(WITH_TRADE "Build Trade library" ON "NOT WITH_MESHTOOLS;NOT WITH_PRIMITIVES;NOT WITH_IMAGECONVERTER;NOT WITH_ANYIMAGEIMPORTER;NOT WITH_ANYIMAGECONVERTER;NOT WITH_ANYSCENEIMPORTER;NOT WITH_OBJIMPORTER;NOT WITH_TGAIMAGECONVERTER;NOT WITH_TGAIMPORTER" ON)
-cmake_dependent_option(WITH_GL "Build GL library" ON "NOT WITH_DEBUGTOOLS;NOT WITH_MESHTOOLS;NOT WITH_PRIMITIVES;NOT WITH_SHADERS;NOT WITH_TEXT;NOT WITH_TEXTURETOOLS;NOT WITH_TRADE;NOT WITH_MAGNUMINFO;NOT WITH_ANDROIDAPPLICATION;NOT WITH_WINDOWLESSIOSAPPLICATION;NOT WITH_CGLCONTEXT;NOT WITH_GLXAPPLICATION;NOT WITH_GLXCONTEXT;NOT WITH_XEGLAPPLICATION;NOT WITH_WINDOWLESSWGLAPPLICATION;NOT WITH_GLXCONTEXT;NOT WITH_XEGLAPPLICATION;NOT WITH_WINDOWLESSWGLAPPLICATION;NOT WITH_WGLCONTEXT;NOT WITH_WINDOWLESSWINDOWSEGLAPPLICATION;NOT WITH_GLFWAPPLICATION;NOT WITH_GLUTAPPLICATION;NOT WITH_SDL2APPLICATION;NOT WITH_DISTANCEFIELDCONVERTER;NOT WITH_FONTCONVERTER;NOT WITH_IMAGECONVERTER" ON)
+cmake_dependent_option(WITH_GL "Build GL library" ON "NOT WITH_DEBUGTOOLS;NOT WITH_MESHTOOLS;NOT WITH_PRIMITIVES;NOT WITH_SHADERS;NOT WITH_TEXT;NOT WITH_TEXTURETOOLS;NOT WITH_TRADE;NOT WITH_GL_INFO;NOT WITH_ANDROIDAPPLICATION;NOT WITH_WINDOWLESSIOSAPPLICATION;NOT WITH_CGLCONTEXT;NOT WITH_GLXAPPLICATION;NOT WITH_GLXCONTEXT;NOT WITH_XEGLAPPLICATION;NOT WITH_WINDOWLESSWGLAPPLICATION;NOT WITH_GLXCONTEXT;NOT WITH_XEGLAPPLICATION;NOT WITH_WINDOWLESSWGLAPPLICATION;NOT WITH_WGLCONTEXT;NOT WITH_WINDOWLESSWINDOWSEGLAPPLICATION;NOT WITH_GLFWAPPLICATION;NOT WITH_GLUTAPPLICATION;NOT WITH_SDL2APPLICATION;NOT WITH_DISTANCEFIELDCONVERTER;NOT WITH_FONTCONVERTER;NOT WITH_IMAGECONVERTER" ON)
 
 cmake_dependent_option(TARGET_GL "Build libraries with OpenGL interoperability" ON "WITH_GL" OFF)
 
@@ -122,7 +122,7 @@ cmake_dependent_option(TARGET_GL "Build libraries with OpenGL interoperability"
 cmake_dependent_option(WITH_AL_INFO "Build magnum-al-info utility" OFF "WITH_AUDIO" OFF)
 
 # EGL context and windowless EGL application, available everywhere
-cmake_dependent_option(WITH_WINDOWLESSEGLAPPLICATION "Build WindowlessEglApplication library" OFF "NOT TARGET_GLES OR TARGET_DESKTOP_GLES OR NOT WITH_MAGNUMINFO" ON)
+cmake_dependent_option(WITH_WINDOWLESSEGLAPPLICATION "Build WindowlessEglApplication library" OFF "NOT TARGET_GLES OR TARGET_DESKTOP_GLES OR NOT WITH_GL_INFO" ON)
 option(WITH_EGLCONTEXT "Build EglContext library" OFF)
 
 # Android-specific application libraries
@@ -135,14 +135,14 @@ elseif(CORRADE_TARGET_IOS)
 
 # macOS-specific application libraries
 elseif(CORRADE_TARGET_APPLE)
-    cmake_dependent_option(WITH_WINDOWLESSCGLAPPLICATION "Build WindowlessCglApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
+    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)
 
 # X11 + GLX/EGL-specific application libraries
 elseif(CORRADE_TARGET_UNIX)
     option(WITH_GLXAPPLICATION "Build GlxApplication library" OFF)
     if(NOT TARGET_GLES OR TARGET_DESKTOP_GLES)
-        cmake_dependent_option(WITH_WINDOWLESSGLXAPPLICATION "Build WindowlessGlxApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
+        cmake_dependent_option(WITH_WINDOWLESSGLXAPPLICATION "Build WindowlessGlxApplication library" OFF "NOT WITH_GL_INFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
         option(WITH_GLXCONTEXT "Build GlxContext library" OFF)
     endif()
     option(WITH_XEGLAPPLICATION "Build XEglApplication library" OFF)
@@ -150,10 +150,10 @@ elseif(CORRADE_TARGET_UNIX)
 # Windows-specific application libraries
 elseif(CORRADE_TARGET_WINDOWS)
     if(NOT TARGET_GLES OR TARGET_DESKTOP_GLES)
-        cmake_dependent_option(WITH_WINDOWLESSWGLAPPLICATION "Build WindowlessWglApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
+        cmake_dependent_option(WITH_WINDOWLESSWGLAPPLICATION "Build WindowlessWglApplication library" OFF "NOT WITH_GL_INFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
         option(WITH_WGLCONTEXT "Build WglContext library" OFF)
     else()
-        cmake_dependent_option(WITH_WINDOWLESSWINDOWSEGLAPPLICATION "Build WindowlessWindowsEglApplication library" OFF "NOT WITH_MAGNUMINFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
+        cmake_dependent_option(WITH_WINDOWLESSWINDOWSEGLAPPLICATION "Build WindowlessWindowsEglApplication library" OFF "NOT WITH_GL_INFO;NOT WITH_FONTCONVERTER;NOT WITH_DISTANCEFIELDCONVERTER" ON)
     endif()
 endif()
 

doc/building.dox

@@ -361,7 +361,7 @@ installed files. The following variables are supported:
     install to `lib64/` instead of `lib/`. In most cases this variable is
     autodetected, so you don't need to set it yourself.
 -   `MAGNUM_DEPLOY_PREFIX` --- Used on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten"
-    to override location where web demos and utilities (such as @ref magnum-info)
+    to override location where web demos and utilities (such as @ref magnum-gl-info)
     are installed, so you can have libraries installed to a system location and
     utilities to your webserver, for example. Defaults to ``.``. If a relative
     path is used, it's relative to `CMAKE_INSTALL_PREFIX`.
@@ -546,12 +546,13 @@ default.
 
 There are also a few command-line utilities, also all disabled by default:
 
--   `WITH_MAGNUMINFO` --- Build the @ref magnum-info "magnum-info" executable,
+-   `WITH_GL_INFO` --- Build the @ref magnum-gl-info "magnum-gl-info"
-    which provides information about the engine and OpenGL capabilities.
+    executable, which provides information about the engine OpenGL
-    Enables building of one of the windowless application libraries based on
+    capabilities. Enables building of one of the windowless application
-    the target platform.
+    libraries based on the target platform.
 -   `WITH_AL_INFO` --- Build the @ref magnum-al-info "magnum-al-info"
-    executable, which provides information about OpenAL capabilities.
+    executable, which provides information about the engine OpenAL
+    capabilities.
 -   `WITH_DISTANCEFIELDCONVERTER` --- Build the
     @ref magnum-distancefieldconverter "magnum-distancefieldconverter"
     executable for converting black&white images to distance field textures.
@@ -793,7 +794,7 @@ Then create build directory and run `cmake` and the build command in it.
 
 WebGL 1.0 (GLES 2.0 equivalent) is enabled by default, switch to 2.0 (GLES 3.0
 equivalent) by disabling `TARGET_GLES2`. If you enable one of the
-@ref magnum-info or @ref magnum-al-info utilities, you can override their
+@ref magnum-gl-info or @ref magnum-al-info utilities, you can override their
 install location by setting `MAGNUM_DEPLOY_PREFIX` --- putting them for example
 in your webserver root.
 

doc/changelog.dox

@@ -177,6 +177,8 @@ See also:
     libraries as well. If using CMake, these dependencies might get linked in
     transitively from other libraries, but that doesn't handle all cases. Due
     to the complexity of this change, no backwards compatibility is provided.
+-   The `magnum-info` utility was renamed to @ref magnum-gl-info. No backwards
+    compatibility symlinks or aliases are provided.
 -   Removed `PixelStorage::setSwapBytes()`, as every Magnum API dealing with
     images basically only asserted that it's not set. Use
     @ref Corrade::Utility::Endianness instead.
@@ -525,7 +527,7 @@ a high-level overview.
 -   New @ref Platform::WindowlessGlxContext "Platform::Windowless*Context"
     classes that manage OpenGL context to make threaded context creation
     possible
--   Ported @ref magnum-info "magnum-info" to Emscripten
+-   Ported @ref magnum-gl-info "magnum-info" to Emscripten
 -   First-class support for scroll events in
     @ref Platform::Sdl2Application::MouseScrollEvent (see
     [mosra/magnum#157](https://github.com/mosra/magnum/pull/157))
@@ -552,7 +554,8 @@ a high-level overview.
     for iOS and macOS
 -   Added @ref Platform::WindowlessGlxApplication::Configuration::setFlags() "Platform::Windowless*Application::Configuration::setFlags()" with
     @ref Platform::WindowlessGlxApplication::Configuration::Flag::Debug "Flag::Debug"
--   @ref magnum-info now accepts `--short` and `--extension-strings` options
+-   @ref magnum-gl-info "magnum-info" now accepts `--short` and
+    `--extension-strings` options
 -   Added @ref Platform::Sdl2Application::windowSize(),
     @ref Platform::GlfwApplication::windowSize()
 -   Extended @ref Platform::Sdl2Application::KeyEvent::Key to be consistent

doc/cmake.dox

@@ -164,7 +164,7 @@ Lastly, a few utility executables are available:
 -   `distancefieldconverter` --- @ref magnum-distancefieldconverter executable
 -   `fontconverter` --- @ref magnum-fontconverter executable
 -   `imageconverter` --- @ref magnum-imageconverter executable
--   `info` --- @ref magnum-info executable
+-   `gl-info` --- @ref magnum-gl-info executable
 -   `al-info` --- @ref magnum-al-info executable
 
 Note that [each namespace](namespaces.html), all @ref Platform libraries and

doc/developers.dox

@@ -489,7 +489,7 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
     -   to @ref GL::Extension::extensions() in `src/Magnum/Context.cpp`
     -   to @cpp Context::tryCreate() @ce in `src/Magnum/Context.cpp`
     -   to specify GLSL version in `src/Magnum/Shader.cpp`
-    -   to the list in `src/Magnum/Platform/magnum-info.cpp`
+    -   to the list in `src/Magnum/Platform/magnum-gl-info.cpp`
     -   to the test in `src/Magnum/Test/ContextTest.cpp`
 12. Add new extensions to `src/Magnum/Extensions.h`
     -   order them by extension ID that is mentioned in every extension spec

doc/troubleshooting.dox

@@ -56,7 +56,7 @@ crashes on GL calls, you might want to try these things:
 -   Check that you use only extensions that are
     @ref GL::Context::isExtensionSupported() "available on your system".
 -   Check that you didn't exceed any implementation-defined limit (see
-    @ref magnum-info output for list of all of them).
+    @ref magnum-gl-info output for list of all of them).
 -   Enable @ref GL::DebugMessage "debug output" to see more detailed errors,
     warnings and performance hints.
 -   If using framebuffer objects,

doc/utilities.dox

@@ -27,7 +27,7 @@ namespace Magnum {
 /** @page utilities Utilities
 @brief Command-line utilities for system information and data conversion
 
--   @subpage magnum-info --- @copybrief magnum-info
+-   @subpage magnum-gl-info --- @copybrief magnum-gl-info
 -   @subpage magnum-al-info --- @copybrief magnum-al-info
 -   @subpage magnum-distancefieldconverter --- @copybrief magnum-distancefieldconverter
 -   @subpage magnum-fontconverter --- @copybrief magnum-fontconverter

modules/FindMagnum.cmake

@@ -84,7 +84,7 @@
 #  distancefieldconverter       - magnum-distancefieldconverter executable
 #  fontconverter                - magnum-fontconverter executable
 #  imageconverter               - magnum-imageconverter executable
-#  info                         - magnum-info executable
+#  gl-info                      - magnum-gl-info executable
 #  al-info                      - magnum-al-info executable
 #
 # Example usage with specifying additional components is::
@@ -435,7 +435,7 @@ endif()
 # components from other repositories)
 set(_MAGNUM_LIBRARY_COMPONENTS "^(Audio|DebugTools|GL|MeshTools|Primitives|SceneGraph|Shaders|Shapes|Text|TextureTools|Trade|AndroidApplication|GlfwApplication|GlutApplication|GlxApplication|Sdl2Application|XEglApplication|WindowlessCglApplication|WindowlessEglApplication|WindowlessGlxApplication|WindowlessIosApplication|WindowlessWglApplication|WindowlessWindowsEglApplication|CglContext|EglContext|GlxContext|WglContext|OpenGLTester)$")
 set(_MAGNUM_PLUGIN_COMPONENTS "^(AnyAudioImporter|AnyImageConverter|AnyImageImporter|AnySceneImporter|MagnumFont|MagnumFontConverter|ObjImporter|TgaImageConverter|TgaImporter|WavAudioImporter)$")
-set(_MAGNUM_EXECUTABLE_COMPONENTS "^(distancefieldconverter|fontconverter|imageconverter|info|al-info)$")
+set(_MAGNUM_EXECUTABLE_COMPONENTS "^(distancefieldconverter|fontconverter|imageconverter|gl-info|al-info)$")
 
 # Find all components
 foreach(_component ${Magnum_FIND_COMPONENTS})

package/archlinux/PKGBUILD

@@ -48,7 +48,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/PKGBUILD-android-arm64

@@ -43,7 +43,7 @@ build() {
         -DWITH_ANDROIDAPPLICATION=ON \
         -DWITH_EGLCONTEXT=ON \
         -DWITH_WINDOWLESSEGLAPPLICATION=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DTARGET_GLES2=OFF \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON

package/archlinux/PKGBUILD-clang

@@ -51,7 +51,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON

package/archlinux/PKGBUILD-clang-libc++

@@ -54,7 +54,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON

package/archlinux/PKGBUILD-coverage

@@ -49,7 +49,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \
@@ -62,7 +62,7 @@ check() {
     CORRADE_TEST_COLOR=ON ctest --output-on-failure -j5 || true
     CORRADE_TEST_COLOR=ON MAGNUM_DISABLE_EXTENSIONS="GL_ARB_direct_state_access" ctest --output-on-failure -R GLTest || true
     CORRADE_TEST_COLOR=ON MAGNUM_DISABLE_EXTENSIONS="GL_ARB_direct_state_access GL_EXT_direct_state_access" ctest --output-on-failure -R GLTest || true
-    ./src/Magnum/Platform/magnum-info --limits > /dev/null
+    ./src/Magnum/Platform/magnum-gl-info --limits > /dev/null
 
     rm -rf coverage
     mkdir coverage

package/archlinux/PKGBUILD-emscripten

@@ -41,7 +41,7 @@ build() {
         -DWITH_TGAIMAGECONVERTER=ON \
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=OFF
     ninja

package/archlinux/PKGBUILD-emscripten-wasm

@@ -41,7 +41,7 @@ build() {
         -DWITH_TGAIMAGECONVERTER=ON \
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=OFF
     ninja

package/archlinux/PKGBUILD-emscripten-wasm-webgl2

@@ -42,7 +42,7 @@ build() {
         -DWITH_TGAIMAGECONVERTER=ON \
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=OFF
     ninja

package/archlinux/PKGBUILD-emscripten-webgl2

@@ -42,7 +42,7 @@ build() {
         -DWITH_TGAIMAGECONVERTER=ON \
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=OFF
     ninja

package/archlinux/PKGBUILD-es2

@@ -37,7 +37,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/PKGBUILD-es2desktop

@@ -42,7 +42,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/PKGBUILD-es3

@@ -37,7 +37,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/PKGBUILD-es3desktop

@@ -42,7 +42,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/PKGBUILD-gcc47

@@ -55,7 +55,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON

package/archlinux/PKGBUILD-mingw-w64

@@ -39,7 +39,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \
@@ -68,7 +68,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/PKGBUILD-release

@@ -43,7 +43,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \
@@ -72,7 +72,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \

package/archlinux/magnum-git/PKGBUILD

@@ -45,7 +45,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
-        -DWITH_MAGNUMINFO=ON \
+        -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON
     make
 }

package/ci/appveyor-desktop-gles.bat

@@ -42,7 +42,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=OFF ^
     -DWITH_FONTCONVERTER=OFF ^
     -DWITH_IMAGECONVERTER=ON ^
-    -DWITH_MAGNUMINFO=ON ^
+    -DWITH_GL_INFO=ON ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^
     -DBUILD_GL_TESTS=ON ^

package/ci/appveyor-desktop-mingw.bat

@@ -41,7 +41,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=ON ^
     -DWITH_FONTCONVERTER=ON ^
     -DWITH_IMAGECONVERTER=ON ^
-    -DWITH_MAGNUMINFO=ON ^
+    -DWITH_GL_INFO=ON ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^
     -DBUILD_GL_TESTS=ON ^

package/ci/appveyor-desktop.bat

@@ -40,7 +40,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=ON ^
     -DWITH_FONTCONVERTER=ON ^
     -DWITH_IMAGECONVERTER=ON ^
-    -DWITH_MAGNUMINFO=ON ^
+    -DWITH_GL_INFO=ON ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^
     -DBUILD_GL_TESTS=ON ^

package/ci/travis-android-arm.sh

@@ -64,6 +64,7 @@ cmake .. \
     -DWITH_TGAIMAGECONVERTER=ON \
     -DWITH_TGAIMPORTER=ON \
     -DWITH_WAVAUDIOIMPORTER=OFF \
+    -DWITH_GL_INFO=ON \
     -DBUILD_TESTS=ON \
     -DBUILD_GL_TESTS=ON \
     -G Ninja

package/ci/travis-desktop-gles.sh

@@ -42,7 +42,7 @@ cmake .. \
     -DWITH_DISTANCEFIELDCONVERTER=OFF \
     -DWITH_FONTCONVERTER=OFF \
     -DWITH_IMAGECONVERTER=ON \
-    -DWITH_MAGNUMINFO=ON \
+    -DWITH_GL_INFO=ON \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \
     -DBUILD_GL_TESTS=ON \

package/ci/travis-desktop.sh

@@ -43,7 +43,7 @@ cmake .. \
     -DWITH_DISTANCEFIELDCONVERTER=ON \
     -DWITH_FONTCONVERTER=ON \
     -DWITH_IMAGECONVERTER=ON \
-    -DWITH_MAGNUMINFO=ON \
+    -DWITH_GL_INFO=ON \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \
     -DBUILD_GL_TESTS=ON \

package/ci/travis-emscripten.sh

@@ -61,7 +61,7 @@ cmake .. \
     -DWITH_TGAIMAGECONVERTER=ON \
     -DWITH_TGAIMPORTER=ON \
     -DWITH_WAVAUDIOIMPORTER=ON \
-    -DWITH_MAGNUMINFO=ON \
+    -DWITH_GL_INFO=ON \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \
     -DTARGET_GLES2=$TARGET_GLES2 \

package/debian/rules

@@ -36,7 +36,7 @@ override_dh_auto_configure:
 		-DWITH_DISTANCEFIELDCONVERTER=ON \
 		-DWITH_IMAGECONVERTER=ON \
 		-DWITH_FONTCONVERTER=ON \
-		-DWITH_MAGNUMINFO=ON \
+		-DWITH_GL_INFO=ON \
 		-DWITH_AL_INFO=ON
 
 # Extraordinarily coarse way to suppress error about libGL not being in

package/gentoo/dev-libs/magnum/magnum-9999.ebuild

@@ -44,7 +44,7 @@ src_configure() {
 		-DWITH_DISTANCEFIELDCONVERTER=ON
 		-DWITH_IMAGECONVERTER=ON
 		-DWITH_FONTCONVERTER=ON
-		-DWITH_MAGNUMINFO=ON
+		-DWITH_GL_INFO=ON
 		-DWITH_AL_INFO=ON
 	)
 	cmake-utils_src_configure

package/homebrew/magnum.rb

@@ -13,7 +13,7 @@ class Magnum < Formula
   def install
     system "mkdir build"
     cd "build" do
-      system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DMAGNUM_PLUGINS_DIR=#{HOMEBREW_PREFIX}/lib/magnum", "-DWITH_AUDIO=ON", "-DWITH_GLFWAPPLICATION=OFF", "-DWITH_SDL2APPLICATION=ON", "-DWITH_WINDOWLESSCGLAPPLICATION=ON", "-DWITH_CGLCONTEXT=ON", "-DWITH_OPENGLTESTER=ON", "-DWITH_ANYAUDIOIMPORTER=ON", "-DWITH_ANYIMAGECONVERTER=ON", "-DWITH_ANYIMAGEIMPORTER=ON", "-DWITH_ANYSCENEIMPORTER=ON", "-DWITH_MAGNUMFONT=ON", "-DWITH_MAGNUMFONTCONVERTER=ON", "-DWITH_OBJIMPORTER=ON", "-DWITH_TGAIMAGECONVERTER=ON", "-DWITH_TGAIMPORTER=ON", "-DWITH_WAVAUDIOIMPORTER=ON", "-DWITH_DISTANCEFIELDCONVERTER=ON", "-DWITH_FONTCONVERTER=ON", "-DWITH_IMAGECONVERTER=ON", "-DWITH_MAGNUMINFO=ON", "-DWITH_AL_INFO=ON", ".."
+      system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DMAGNUM_PLUGINS_DIR=#{HOMEBREW_PREFIX}/lib/magnum", "-DWITH_AUDIO=ON", "-DWITH_GLFWAPPLICATION=OFF", "-DWITH_SDL2APPLICATION=ON", "-DWITH_WINDOWLESSCGLAPPLICATION=ON", "-DWITH_CGLCONTEXT=ON", "-DWITH_OPENGLTESTER=ON", "-DWITH_ANYAUDIOIMPORTER=ON", "-DWITH_ANYIMAGECONVERTER=ON", "-DWITH_ANYIMAGEIMPORTER=ON", "-DWITH_ANYSCENEIMPORTER=ON", "-DWITH_MAGNUMFONT=ON", "-DWITH_MAGNUMFONTCONVERTER=ON", "-DWITH_OBJIMPORTER=ON", "-DWITH_TGAIMAGECONVERTER=ON", "-DWITH_TGAIMPORTER=ON", "-DWITH_WAVAUDIOIMPORTER=ON", "-DWITH_DISTANCEFIELDCONVERTER=ON", "-DWITH_FONTCONVERTER=ON", "-DWITH_IMAGECONVERTER=ON", "-DWITH_GL_INFO=ON", "-DWITH_AL_INFO=ON", ".."
       system "cmake", "--build", "."
       system "cmake", "--build", ".", "--target", "install"
     end

src/Magnum/Platform/CMakeLists.txt

@@ -719,57 +719,57 @@ if(NEED_WGLCONTEXT OR WITH_WGLCONTEXT)
     endif()
 endif()
 
-# Magnum Info
+# Magnum GL Info
-if(WITH_MAGNUMINFO)
+if(WITH_GL_INFO)
-    add_executable(magnum-info info.cpp)
+    add_executable(magnum-gl-info gl-info.cpp)
-    target_link_libraries(magnum-info PRIVATE MagnumGL)
+    target_link_libraries(magnum-gl-info PRIVATE MagnumGL)
     if(MAGNUM_TARGET_HEADLESS OR CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
-        target_link_libraries(magnum-info PRIVATE MagnumWindowlessEglApplication)
+        target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessEglApplication)
     elseif(CORRADE_TARGET_IOS)
-        target_link_libraries(magnum-info PRIVATE MagnumWindowlessIosApplication)
+        target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessIosApplication)
     elseif(CORRADE_TARGET_APPLE)
-        target_link_libraries(magnum-info PRIVATE MagnumWindowlessCglApplication)
+        target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessCglApplication)
     elseif(CORRADE_TARGET_UNIX)
         if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
-            target_link_libraries(magnum-info PRIVATE MagnumWindowlessEglApplication)
+            target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessEglApplication)
         else()
-            target_link_libraries(magnum-info PRIVATE MagnumWindowlessGlxApplication)
+            target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessGlxApplication)
         endif()
     elseif(CORRADE_TARGET_WINDOWS)
         if(MAGNUM_TARGET_GLES AND NOT MAGNUM_TARGET_DESKTOP_GLES)
-            target_link_libraries(magnum-info PRIVATE MagnumWindowlessWindowsEglApplication)
+            target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessWindowsEglApplication)
         else()
-            target_link_libraries(magnum-info PRIVATE MagnumWindowlessWglApplication)
+            target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessWglApplication)
         endif()
     else()
-        message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.")
+        message(FATAL_ERROR "magnum-gl-info is not available on this platform. Set WITH_GL_INFO to OFF to skip building it.")
     endif()
-    set_target_properties(magnum-info PROPERTIES FOLDER "Magnum/Platform")
+    set_target_properties(magnum-gl-info PROPERTIES FOLDER "Magnum/Platform")
 
     if(NOT CORRADE_TARGET_EMSCRIPTEN)
-        install(TARGETS magnum-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
+        install(TARGETS magnum-gl-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
     endif()
 
     if(CORRADE_TARGET_IOS)
-        set_target_properties(magnum-info PROPERTIES
+        set_target_properties(magnum-gl-info PROPERTIES
             MACOSX_BUNDLE ON
             MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
             XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES")
     elseif(CORRADE_TARGET_EMSCRIPTEN)
-        install(FILES info.html DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-info RENAME index.html)
+        install(FILES gl-info.html DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-gl-info RENAME index.html)
-        install(TARGETS magnum-info DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-info)
+        install(TARGETS magnum-gl-info DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-gl-info)
         install(FILES
             WebApplication.css
             WindowlessEmscriptenApplication.js
-            DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-info)
+            DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-gl-info)
         install(FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/magnum-info.js.mem
+            ${CMAKE_CURRENT_BINARY_DIR}/magnum-gl-info.js.mem
-            ${CMAKE_CURRENT_BINARY_DIR}/magnum-info.wasm
+            ${CMAKE_CURRENT_BINARY_DIR}/magnum-gl-info.wasm
-            DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-info OPTIONAL)
+            DESTINATION ${MAGNUM_DEPLOY_PREFIX}/magnum-gl-info OPTIONAL)
     endif()
 
     # Magnum info target alias for superprojects
-    add_executable(Magnum::info ALIAS magnum-info)
+    add_executable(Magnum::gl-info ALIAS magnum-gl-info)
 endif()
 
 # Force IDEs display also all header files and additional files in project view

src/Magnum/Platform/MacOSXBundleInfo.plist.in

@@ -7,11 +7,11 @@
     <key>CFBundleExecutable</key>
     <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
     <key>CFBundleIdentifier</key>
-    <string>cz.mosra.magnum.magnum-info</string>
+    <string>cz.mosra.magnum.magnum-gl-info</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>magnum-info</string>
+    <string>magnum-gl-info</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
 

src/Magnum/Platform/gl-info.cpp

@@ -80,14 +80,14 @@
 
 namespace Magnum {
 
-/** @page magnum-info Magnum Info
+/** @page magnum-gl-info Magnum GL Info
-@brief Displays information about Magnum engine and OpenGL capabilities
+@brief Displays information about Magnum engine OpenGL capabilities
 
 @m_footernavigation
 
 @m_div{m-button m-primary} <a href="http://magnum.graphics/showcase/magnum-info/">@m_div{m-big}Live web version @m_enddiv @m_div{m-small} uses WebAssembly & WebGL @m_enddiv </a> @m_enddiv
 
-@section magnum-info-usage Usage
+@section magnum-gl-info-usage Usage
 
 @code{.sh}
 magnum-info [--magnum-...] [-h|--help] [-s|--short] [--all-extensions]
@@ -102,7 +102,7 @@ Arguments:
 -   `--limits` --- display also limits and implementation-defined values
 -   `--magnum-...` --- engine-specific options (see @ref Context for details)
 
-@subsection magnum-info-usage-emscripten Usage on Emscripten
+@subsection magnum-gl-info-usage-emscripten Usage on Emscripten
 
 When installing Magnum, point the `MAGNUM_DEPLOY_PREFIX` CMake variable to your
 webserver location. The Magnum Info utility is then available in a `magnum-info/`
@@ -111,7 +111,7 @@ above to it via GET parameters. See the relevant section of
 @ref Platform-WindowlessEglApplication-usage-emscripten "WindowlessEglApplication documentation"
 for more information.
 
-@subsection magnum-info-usage-android Usage on Android
+@subsection magnum-gl-info-usage-android Usage on Android
 
 When you have developer-enabled Android device connected or Android emulator
 running, you can use ADB to upload the built executable to device temp
@@ -123,15 +123,15 @@ adb shell /data/local/tmp/magnum-info
 @endcode
 
 You can also use @cb{.sh} adb shell @ce to log directly into the device shell
-and continue from there. All @ref magnum-info-usage "command-line" arguments
+and continue from there. All @ref magnum-gl-info-usage "command-line" arguments
 are supported.
 
-@section magnum-info-example Example output
+@section magnum-gl-info-example Example output
 
 @code{.shell-session}
 
   +---------------------------------------------------------+
-  | Information about Magnum engine and OpenGL capabilities |
+  |   Information about Magnum engine OpenGL capabilities   |
   +---------------------------------------------------------+
 
 Used application: Platform::WindowlessGlxApplication
@@ -196,7 +196,7 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
 
     Debug() << "";
     Debug() << "  +---------------------------------------------------------+";
-    Debug() << "  | Information about Magnum engine and OpenGL capabilities |";
+    Debug() << "  |   Information about Magnum engine OpenGL capabilities   |";
     Debug() << "  +---------------------------------------------------------+";
     Debug() << "";
 

src/Magnum/Platform/gl-info.html

@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>Magnum Info</title>
+    <title>Magnum GL Info</title>
     <meta charset="utf-8" />
     <link rel="stylesheet" href="WebApplication.css" />
   </head>
   <body>
-    <h1>Magnum Info</h1>
+    <h1>Magnum GL Info</h1>
     <div id="listener">
       <canvas id="module" class="hidden"></canvas>
       <pre id="log"></pre>
       <div id="status">Initialization...</div>
       <div id="statusDescription"></div>
       <script src="WindowlessEmscriptenApplication.js"></script>
-      <script async="async" src="magnum-info.js"></script>
+      <script async="async" src="magnum-gl-info.js"></script>
     </div>
   </body>
 </html>

src/MagnumExternal/OpenGL/GL/extensions.txt

@@ -1,5 +1,6 @@
-# The following output is taken from `magnum-info` with removed `GL_` prefixes.
+# The following output is taken from `magnum-gl-info` with removed `GL_`
-# Only vendor extensions are needed, everything else is pulled in with GL 4.5.
+# prefixes. Only vendor extensions are needed, everything else is pulled in
+# with GL 4.6.
 
 version 4.6 core
 

src/MagnumExternal/OpenGL/GLES2/Emscripten/extensions.txt

@@ -1,4 +1,5 @@
-# The following output is taken from `magnum-info` with removed `GL_` prefixes.
+# The following output is taken from `magnum-gl-info` with removed `GL_`
+# prefixes.
 
 version 2.0 es
 

src/MagnumExternal/OpenGL/GLES2/extensions.txt

@@ -1,4 +1,5 @@
-# The following output is taken from `magnum-info` with removed `GL_` prefixes.
+# The following output is taken from `magnum-gl-info` with removed `GL_`
+# prefixes.
 
 version 2.0 es
 

src/MagnumExternal/OpenGL/GLES3/Emscripten/extensions.txt

@@ -1,4 +1,5 @@
-# The following output is taken from `magnum-info` with removed `GL_` prefixes.
+# The following output is taken from `magnum-gl-info` with removed `GL_`
+# prefixes.
 
 version 3.0 es
 

src/MagnumExternal/OpenGL/GLES3/extensions.txt

@@ -1,4 +1,4 @@
-# The following output is taken from `magnum-info --all-extensions` with
+# The following output is taken from `magnum-gl-info --all-extensions` with
 # removed `GL_` prefixes.
 
 version 3.2 es