From 48de33a5d8aa105da881af3f90a58c9fc975a147 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 5 Apr 2018 15:51:10 +0200 Subject: [PATCH] Updated inter-library option dependencies and related docs. --- CMakeLists.txt | 10 +++++----- doc/building.dox | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 513b8eb99..41434767a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,9 @@ endif() # API-independent utilities option(WITH_IMAGECONVERTER "Build magnum-imageconverter utility" OFF) +# Magnum AL Info +option(WITH_AL_INFO "Build magnum-al-info utility" OFF) + # Plugins option(WITH_ANYIMAGEIMPORTER "Build AnyImageImporter plugin" OFF) option(WITH_ANYAUDIOIMPORTER "Build AnyAudioImporter plugin" OFF) @@ -101,19 +104,16 @@ cmake_dependent_option(WITH_TGAIMAGECONVERTER "Build TgaImageConverter plugin" O cmake_dependent_option(WITH_TGAIMPORTER "Build TgaImporter plugin" OFF "NOT WITH_MAGNUMFONT" ON) # Parts of the library -cmake_dependent_option(WITH_AUDIO "Build Audio library" OFF "NOT WITH_WAVAUDIOIMPORTER" ON) +cmake_dependent_option(WITH_AUDIO "Build Audio library" OFF "NOT WITH_AL_INFO;NOT WITH_ANYAUDIOIMPORTER;NOT WITH_WAVAUDIOIMPORTER" ON) option(WITH_DEBUGTOOLS "Build DebugTools library" ON) cmake_dependent_option(WITH_MESHTOOLS "Build MeshTools library" ON "( NOT WITH_DEBUGTOOLS OR ( NOT WITH_SHAPES AND NOT WITH_SCENEGRAPH ) ) AND NOT WITH_OBJIMPORTER" ON) cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" ON "NOT WITH_DEBUGTOOLS OR NOT WITH_SHAPES" ON) option(WITH_SHAPES "Build Shapes library" ON) cmake_dependent_option(WITH_SCENEGRAPH "Build SceneGraph library" ON "NOT WITH_SHAPES" ON) cmake_dependent_option(WITH_SHADERS "Build Shaders library" ON "NOT WITH_DEBUGTOOLS OR ( NOT WITH_SHAPES AND NOT WITH_SCENEGRAPH )" ON) -cmake_dependent_option(WITH_TEXT "Build Text library" ON "NOT WITH_MAGNUMFONT;NOT WITH_MAGNUMFONTCONVERTER" ON) +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) -# Magnum AL Info -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) option(WITH_EGLCONTEXT "Build EglContext library" OFF) diff --git a/doc/building.dox b/doc/building.dox index 16ce8f774..1ffe24bf5 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -489,7 +489,7 @@ see @ref building-plugins for more information. None of the plugins is built by default. - `WITH_ANYAUDIOIMPORTER` --- Build the @ref Audio::AnyImporter "AnyAudioImporter" - plugin. Available only if `WITH_AUDIO` is enabled. + plugin. Enables also building of the @ref Audio library. - `WITH_ANYIMAGECONVERTER` --- Build the @ref Trade::AnyImageConverter "AnyImageConverter" plugin. - `WITH_ANYIMAGEIMPORTER` --- Build the @ref Trade::AnyImageImporter "AnyImageImporter" @@ -497,11 +497,11 @@ default. - `WITH_ANYSCENEIMPORTER` --- Build the @ref Trade::AnySceneImporter "AnySceneImporter" plugin. - `WITH_MAGNUMFONT` --- Build the @ref Text::MagnumFont "MagnumFont" plugin. - Available only if `WITH_TEXT` is enabled. Enables also building of the + Enables also building of the @ref Text library and the @ref Trade::TgaImporter "TgaImporter" plugin. - `WITH_MAGNUMFONTCONVERTER` --- Build the - @ref Text::MagnumFontConverter "MagnumFontConverter" plugin. Available only - if `WITH_TEXT` is enabled. Enables also building of their + @ref Text::MagnumFontConverter "MagnumFontConverter" plugin. Enables also + building of the @ref Text library and the @ref Trade::TgaImageConverter "TgaImageConverter" plugin. - `WITH_OBJIMPORTER` --- Build the @ref Trade::ObjImporter "ObjImporter" plugin. @@ -510,7 +510,7 @@ default. - `WITH_TGAIMAGECONVERTER` --- Build the @ref Trade::TgaImageConverter "TgaImageConverter" plugin. - `WITH_WAVAUDIOIMPORTER` --- Build the @ref Audio::WavImporter "WavAudioImporter" - plugin. Available only if `WITH_AUDIO` is enabled. + plugin. Enables also building of the @ref Audio library. There are also a few command-line utilities, also all disabled by default: