From 6b75d97e08af4d73b5c0f6c57593e5878de93c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 12 Dec 2018 01:15:07 +0100
Subject: [PATCH] Removed old-style CMake _LIBRARIES and _INCLUDE_DIRS
 variables.

Deprecated in 01ffbe93a95c3f2e5dcac561f621be3778a60cb5 (February 2016).
Use the new-style Magnum::* imported targets instead.
---
 doc/changelog.dox        |  3 +++
 doc/cmake.dox            | 15 ---------------
 modules/FindMagnum.cmake | 31 -------------------------------
 3 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/doc/changelog.dox b/doc/changelog.dox
index 047a12ea9..62a6b4a65 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -186,6 +186,9 @@ See also:
 -   Removed @cpp Platform::GlfwApplication::Configuration::WindowFlag::Resizeable @ce,
     deprecated since February 2017. Use @ref Platform::GlfwApplication::Configuration::WindowFlag::Resizable
     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
 
diff --git a/doc/cmake.dox b/doc/cmake.dox
index 603c7d955..aad4dc122 100644
--- a/doc/cmake.dox
+++ b/doc/cmake.dox
@@ -242,21 +242,6 @@ are also available as preprocessor variables if including
 -   `MAGNUM_TARGET_VK` --- Defined if compiled with Vulkan interoperability
     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
 @ref corrade-cmake "its documentation" for more information.
 @ref cmake-plugins "Plugins repository", @ref cmake-integration "Integration repository"
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index ea5a7e981..3d0e71021 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -178,21 +178,6 @@
 #  MAGNUM_INCLUDE_INSTALL_DIR   - 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.
@@ -967,11 +952,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
             unset(_MAGNUM_GLCONTEXT_ALIAS)
         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()
 
 # Emscripten-specific files
@@ -1035,9 +1015,6 @@ if(_MAGNUM_WINDOWLESSAPPLICATION_ALIAS AND NOT TARGET Magnum::WindowlessApplicat
                 IMPORTED_LOCATION_DEBUG ${_MAGNUM_WINDOWLESSAPPLICATION_IMPORTED_LOCATION_DEBUG})
         endif()
     endif()
-    if(MAGNUM_BUILD_DEPRECATED)
-        set(MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES Magnum::WindowlessApplication)
-    endif()
     # Prevent creating the alias again
     unset(_MAGNUM_WINDOWLESSAPPLICATION_ALIAS)
 endif()
@@ -1065,9 +1042,6 @@ if(_MAGNUM_APPLICATION_ALIAS AND NOT TARGET Magnum::Application)
                 IMPORTED_LOCATION_DEBUG ${_MAGNUM_APPLICATION_IMPORTED_LOCATION_DEBUG})
         endif()
     endif()
-    if(MAGNUM_BUILD_DEPRECATED)
-        set(MAGNUM_APPLICATION_LIBRARIES Magnum::Application)
-    endif()
     # Prevent creating the alias again
     unset(_MAGNUM_APPLICATION_ALIAS)
 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_DEBUG_DIR ${MAGNUM_PLUGINS_DEBUG_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()