Browse Source

Removed old-style CMake _LIBRARIES and _INCLUDE_DIRS variables.

Deprecated in 01ffbe93a9 (February 2016).
Use the new-style Magnum::* imported targets instead.
simd
Vladimír Vondruš 8 years ago
parent
commit
6b75d97e08
  1. 3
      doc/changelog.dox
  2. 15
      doc/cmake.dox
  3. 31
      modules/FindMagnum.cmake

3
doc/changelog.dox

@ -186,6 +186,9 @@ See also:
- Removed @cpp Platform::GlfwApplication::Configuration::WindowFlag::Resizeable @ce, - Removed @cpp Platform::GlfwApplication::Configuration::WindowFlag::Resizeable @ce,
deprecated since February 2017. Use @ref Platform::GlfwApplication::Configuration::WindowFlag::Resizable deprecated since February 2017. Use @ref Platform::GlfwApplication::Configuration::WindowFlag::Resizable
instead. instead.
- Removed `MAGNUM_*_LIBRARIES` and `MAGNUM_*_INCLUDE_DIRS` CMake variables,
which were deprecated in favor of `Magnum::*` imported targets in
February 2016.
@section changelog-2018-10 2018.10 @section changelog-2018-10 2018.10

15
doc/cmake.dox

@ -242,21 +242,6 @@ are also available as preprocessor variables if including
- `MAGNUM_TARGET_VK` --- Defined if compiled with Vulkan interoperability - `MAGNUM_TARGET_VK` --- Defined if compiled with Vulkan interoperability
enabled enabled
Workflows without imported targets are deprecated and the following variables
are included just for backwards compatibility and only if
@ref MAGNUM_BUILD_DEPRECATED is enabled:
- `MAGNUM_LIBRARIES` --- Expands to `Magnum::Magnum` target. Use `Magnum::Magnum`
target directly instead.
- `MAGNUM_*_LIBRARIES` --- Expands to `Magnum::*` target. Use `Magnum::*`
target directly instead.
- `MAGNUM_APPLICATION_LIBRARIES` / `MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES`
--- Expands to `Magnum::Application` / `Magnum::WindowlessApplication`
target. Use `Magnum::Application` / `Magnum::WindowlessApplication` target
directly instead.
- `MAGNUM_CONTEXT_LIBRARIES` --- Expands to `Magnum::Context` target. Use
`Magnum::Context` target directly instead.
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", @ref cmake-integration "Integration repository" @ref cmake-plugins "Plugins repository", @ref cmake-integration "Integration repository"

31
modules/FindMagnum.cmake

@ -178,21 +178,6 @@
# MAGNUM_INCLUDE_INSTALL_DIR - Header installation directory # MAGNUM_INCLUDE_INSTALL_DIR - Header installation directory
# MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR - Plugin header installation directory # MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR - Plugin header installation directory
# #
# Workflows without imported targets are deprecated and the following variables
# are included just for backwards compatibility and only if
# :variable:`MAGNUM_BUILD_DEPRECATED` is enabled:
#
# MAGNUM_LIBRARIES - Expands to ``Magnum::Magnum`` target. Use
# ``Magnum::Magnum`` target directly instead.
# MAGNUM_*_LIBRARIES - Expands to ``Magnum::*`` target. Use
# ``Magnum::*`` target directly instead.
# MAGNUM_APPLICATION_LIBRARIES / MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES
# - Expands to ``Magnum::Application`` /
# ``Magnum::WindowlessApplication`` target. Use ``Magnum::Application`` /
# ``Magnum::WindowlessApplication`` target directly instead.
# MAGNUM_CONTEXT_LIBRARIES - Expands to ``Magnum::Context`` target. Use
# ``Magnum::Context`` target directly instead.
#
# #
# This file is part of Magnum. # This file is part of Magnum.
@ -967,11 +952,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
unset(_MAGNUM_GLCONTEXT_ALIAS) unset(_MAGNUM_GLCONTEXT_ALIAS)
endif() endif()
endif() endif()
# Deprecated variables
if(MAGNUM_BUILD_DEPRECATED AND _component MATCHES ${_MAGNUM_LIBRARY_COMPONENTS} OR _component MATCHES ${_MAGNUM_PLUGIN_COMPONENTS})
set(MAGNUM_${_COMPONENT}_LIBRARIES Magnum::${_component})
endif()
endforeach() endforeach()
# Emscripten-specific files # Emscripten-specific files
@ -1035,9 +1015,6 @@ if(_MAGNUM_WINDOWLESSAPPLICATION_ALIAS AND NOT TARGET Magnum::WindowlessApplicat
IMPORTED_LOCATION_DEBUG ${_MAGNUM_WINDOWLESSAPPLICATION_IMPORTED_LOCATION_DEBUG}) IMPORTED_LOCATION_DEBUG ${_MAGNUM_WINDOWLESSAPPLICATION_IMPORTED_LOCATION_DEBUG})
endif() endif()
endif() endif()
if(MAGNUM_BUILD_DEPRECATED)
set(MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES Magnum::WindowlessApplication)
endif()
# Prevent creating the alias again # Prevent creating the alias again
unset(_MAGNUM_WINDOWLESSAPPLICATION_ALIAS) unset(_MAGNUM_WINDOWLESSAPPLICATION_ALIAS)
endif() endif()
@ -1065,9 +1042,6 @@ if(_MAGNUM_APPLICATION_ALIAS AND NOT TARGET Magnum::Application)
IMPORTED_LOCATION_DEBUG ${_MAGNUM_APPLICATION_IMPORTED_LOCATION_DEBUG}) IMPORTED_LOCATION_DEBUG ${_MAGNUM_APPLICATION_IMPORTED_LOCATION_DEBUG})
endif() endif()
endif() endif()
if(MAGNUM_BUILD_DEPRECATED)
set(MAGNUM_APPLICATION_LIBRARIES Magnum::Application)
endif()
# Prevent creating the alias again # Prevent creating the alias again
unset(_MAGNUM_APPLICATION_ALIAS) unset(_MAGNUM_APPLICATION_ALIAS)
endif() endif()
@ -1162,8 +1136,3 @@ set(MAGNUM_PLUGINS_IMPORTER_RELEASE_DIR ${MAGNUM_PLUGINS_RELEASE_DIR}/importers)
set(MAGNUM_PLUGINS_AUDIOIMPORTER_DIR ${MAGNUM_PLUGINS_DIR}/audioimporters) set(MAGNUM_PLUGINS_AUDIOIMPORTER_DIR ${MAGNUM_PLUGINS_DIR}/audioimporters)
set(MAGNUM_PLUGINS_AUDIOIMPORTER_DEBUG_DIR ${MAGNUM_PLUGINS_DEBUG_DIR}/audioimporters) set(MAGNUM_PLUGINS_AUDIOIMPORTER_DEBUG_DIR ${MAGNUM_PLUGINS_DEBUG_DIR}/audioimporters)
set(MAGNUM_PLUGINS_AUDIOIMPORTER_RELEASE_DIR ${MAGNUM_PLUGINS_RELEASE_DIR}/audioimporters) set(MAGNUM_PLUGINS_AUDIOIMPORTER_RELEASE_DIR ${MAGNUM_PLUGINS_RELEASE_DIR}/audioimporters)
# Deprecated variables
if(MAGNUM_BUILD_DEPRECATED)
set(MAGNUM_LIBRARIES Magnum::Magnum)
endif()

Loading…
Cancel
Save