From e0728baf037e534576ff13573aaf1bf000959349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 20 Dec 2012 19:12:30 +0100
Subject: [PATCH] Adapt to "recent" (sic) Platform changes, update docs.

---
 CMakeLists.txt           |  2 +-
 doc/building.dox         | 18 +++++++++++-------
 modules/FindMagnum.cmake |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d2fe3463..b03431419 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ option(TARGET_GLES "Build for OpenGL ES instead of desktop OpenGL" OFF)
 cmake_dependent_option(TARGET_GLES2 "Build for OpenGL ES 2" ON "TARGET_GLES" OFF)
 
 # Parts of the library
-option(WITH_EVERYTHING "Build everything (doesn't include contexts)" ON)
+option(WITH_EVERYTHING "Build everything (doesn't include *Application libraries)" ON)
 cmake_dependent_option(WITH_MESHTOOLS "Build MeshTools library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON)
 cmake_dependent_option(WITH_PHYSICS "Build Physics library" OFF "NOT WITH_EVERYTHING" ON)
 cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" OFF "NOT WITH_EVERYTHING;NOT WITH_PHYSICS" ON)
diff --git a/doc/building.dox b/doc/building.dox
index 9bf5dd1b1..4014adb3d 100644
--- a/doc/building.dox
+++ b/doc/building.dox
@@ -63,25 +63,29 @@ By default the engine is built with everything except
 @ref Platform "application libraries". Using `WITH_*` CMake parameters you can
 specify which parts will be built and which not:
 
- - `WITH_EVERYTHING` - Defaults to `ON`, builds everything except window
-   contexts. If set to `OFF`, only the main library is built and you can
-   select additional libraries with the following:
+ - `WITH_EVERYTHING` - Defaults to `ON`, builds everything except application
+   libraries. If set to `OFF`, only the main library is built and you can
+   select additional components with the following:
  - `WITH_MESHTOOLS` - MeshTools library.
  - `WITH_PHYSICS` - Physics library.
  - `WITH_PRIMITIVES` - Primitives library.
  - `WITH_SCENEGRAPH` - SceneGraph library.
  - `WITH_SHADERS` - Shaders library.
+ - `WITH_MAGNUMINFO` - `magnum-info` executable, provides information about
+   Magnum engine and OpenGL capabilities.
 
 None of the application libraries is built by default, regardless to
 `WITH_EVERYTHING` is enabled or not:
 
- - `WITH_XEGLAPPLICATION` - X/EGL application, available only if targeting
+ - `WITH_XEGLAPPLICATION` - XEglApplication, available only if targeting
    OpenGL ES (see above). Requires **X11** and **EGL** libraries.
- - `WITH_GLXAPPLICATION` - GLX application. Requires **X11** and **GLX**
+ - `WITH_GLXAPPLICATION` - GlxApplication. Requires **X11** and **GLX**
    libraries.
- - `WITH_GLUTAPPLICATION` - GLUT application, available only if targeting
+ - `WITH_WINDOWLESSGLXAPPLICATION` - Windowless GLX application. Requires
+   **X11** and **GLX** libraries.
+ - `WITH_GLUTAPPLICATION` - GlutApplication, available only if targeting
    desktop OpenGL. Requires **GLUT** library.
- - `WITH_SDL2APPLICATION` - SDL2 application. Requires **SDL2** library.
+ - `WITH_SDL2APPLICATION` - Sdl2Application. Requires **SDL2** library.
 
 @subsection building-tests Building and running unit tests
 
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index 1d031e8e2..6a69a0d03 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -155,7 +155,7 @@ foreach(component ${Magnum_FIND_COMPONENTS})
             endif()
         endif()
 
-        # GLX application dependencies
+        # Windowless GLX application dependencies
         if(${component} STREQUAL WindowlessGlxApplication)
             find_package(X11)
             if(X11_FOUND)