Browse Source

Properly check (and document) dependencies for Text library.

pull/7/head
Vladimír Vondruš 13 years ago
parent
commit
e67142db1d
  1. 2
      CMakeLists.txt
  2. 10
      modules/FindMagnum.cmake

2
CMakeLists.txt

@ -17,7 +17,7 @@ cmake_dependent_option(WITH_PRIMITIVES "Builf Primitives library" OFF "NOT WITH_
cmake_dependent_option(WITH_SCENEGRAPH "Build SceneGraph library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON) cmake_dependent_option(WITH_SCENEGRAPH "Build SceneGraph library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON)
cmake_dependent_option(WITH_SHADERS "Build Shaders library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON) cmake_dependent_option(WITH_SHADERS "Build Shaders library" OFF "NOT WITH_EVERYTHING;NOT WITH_DEBUGTOOLS" ON)
cmake_dependent_option(WITH_TEXT "Build Text library" OFF "NOT WITH_EVERYTHING" ON) cmake_dependent_option(WITH_TEXT "Build Text library" OFF "NOT WITH_EVERYTHING" ON)
cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" OFF "NOT WITH_EVERYTHING" ON) cmake_dependent_option(WITH_TEXTURETOOLS "Build TextureTools library" OFF "NOT WITH_EVERYTHING;NOT WITH_TEXT" ON)
cmake_dependent_option(WITH_MAGNUMINFO "Build magnum-info utility" OFF "NOT WITH_EVERYTHING" ON) cmake_dependent_option(WITH_MAGNUMINFO "Build magnum-info utility" OFF "NOT WITH_EVERYTHING" ON)

10
modules/FindMagnum.cmake

@ -22,7 +22,8 @@
# Primitives - Library with stock geometric primitives (static) # Primitives - Library with stock geometric primitives (static)
# SceneGraph - Scene graph library # SceneGraph - Scene graph library
# Shaders - Library with stock shaders # Shaders - Library with stock shaders
# Text - Text rendering library # Text - Text rendering library (depends on TextureTools component,
# HarfBuzz and FreeType library)
# TextureTools - TextureTools library # TextureTools - TextureTools library
# GlxApplication - GLX application (depends on X11 libraries) # GlxApplication - GLX application (depends on X11 libraries)
# XEglApplication - X/EGL application (depends on EGL and X11 libraries) # XEglApplication - X/EGL application (depends on EGL and X11 libraries)
@ -208,6 +209,13 @@ foreach(component ${Magnum_FIND_COMPONENTS})
# Text library # Text library
if(${component} STREQUAL Text) if(${component} STREQUAL Text)
set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Font.h) set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Font.h)
# Dependencies
find_package(FreeType)
find_package(HarfBuzz)
if(NOT FREETYPE_FOUND OR NOT HARFBUZZ_FOUND)
unset(MAGNUM_${_COMPONENT}_LIBRARY)
endif()
endif() endif()
# TextureTools library # TextureTools library

Loading…
Cancel
Save