Browse Source

modules: removed deprecated non-absolute include path.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
fa86e1ae3d
  1. 5
      doc/cmake.dox
  2. 14
      modules/FindMagnum.cmake

5
doc/cmake.dox

@ -183,11 +183,6 @@ are also available as preprocessor variables if including
emulation on desktop OpenGL emulation on desktop OpenGL
- `MAGNUM_TARGET_WEBGL` --- Defined if compiled for WebGL - `MAGNUM_TARGET_WEBGL` --- Defined if compiled for WebGL
If `MAGNUM_BUILD_DEPRECATED` is defined, the `MAGNUM_INCLUDE_DIR` variable also
contains path directly to Magnum directory (i.e. for includes without `Magnum/`
prefix) and `MAGNUM_PLUGINS_INCLUDE_DIR` contains include dir for plugins (i.e.
for includes without `MagnumPlugins/` prefix).
Corrade library provides also its own set of CMake macros and variables, see Corrade library provides also its own set of CMake macros and variables, see
@ref corrade-cmake "its documentation" for more information. @ref corrade-cmake "its documentation" for more information.
@ref cmake-plugins "Plugins repository" and @ref cmake-integration "Integration library" @ref cmake-plugins "Plugins repository" and @ref cmake-integration "Integration library"

14
modules/FindMagnum.cmake

@ -98,11 +98,6 @@
# emulation on desktop OpenGL # emulation on desktop OpenGL
# MAGNUM_TARGET_WEBGL - Defined if compiled for WebGL # MAGNUM_TARGET_WEBGL - Defined if compiled for WebGL
# #
# If MAGNUM_BUILD_DEPRECATED is defined, the MAGNUM_INCLUDE_DIR variable also
# contains path directly to Magnum directory (i.e. for includes without
# Magnum/ prefix) and MAGNUM_PLUGINS_INCLUDE_DIR contains include dir for
# plugins (i.e. for includes without MagnumPlugins/ prefix).
#
# Additionally these variables are defined for internal usage: # Additionally these variables are defined for internal usage:
# MAGNUM_INCLUDE_DIR - Root include dir (w/o dependencies) # MAGNUM_INCLUDE_DIR - Root include dir (w/o dependencies)
# MAGNUM_LIBRARY - Magnum library (w/o dependencies) # MAGNUM_LIBRARY - Magnum library (w/o dependencies)
@ -605,15 +600,6 @@ mark_as_advanced(FORCE
MAGNUM_INCLUDE_INSTALL_DIR MAGNUM_INCLUDE_INSTALL_DIR
MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR) MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR)
# Add Magnum dir to include path and create MAGNUM_PLUGINS_INCLUDE_DIR if this
# is deprecated build
if(MAGNUM_BUILD_DEPRECATED)
set(MAGNUM_INCLUDE_DIRS ${MAGNUM_INCLUDE_DIRS}
${MAGNUM_INCLUDE_DIR}/Magnum
${MAGNUM_INCLUDE_DIR}/MagnumExternal)
set(MAGNUM_PLUGINS_INCLUDE_DIR ${MAGNUM_INCLUDE_DIR}/MagnumPlugins)
endif()
# Get base plugin directory from main library location # Get base plugin directory from main library location
set(MAGNUM_PLUGINS_DEBUG_DIR ${_MAGNUM_LIBRARY_PATH}/magnum-d set(MAGNUM_PLUGINS_DEBUG_DIR ${_MAGNUM_LIBRARY_PATH}/magnum-d
CACHE PATH "Base directory where to look for Magnum plugins for debug builds") CACHE PATH "Base directory where to look for Magnum plugins for debug builds")

Loading…
Cancel
Save