From fe2020bc62444f7b40804351195dbdfa9f8ae7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 22 Jul 2018 19:24:36 +0200 Subject: [PATCH] CMake: provide correct alias targets for Any* plugins. Forgotten in 8a2815ade58c29d0edc83cd988157b3c3a7e6efe when moving these out of the plugins directory. --- doc/changelog.dox | 6 ++++++ src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt | 4 ++-- src/MagnumPlugins/AnyImageConverter/CMakeLists.txt | 4 ++-- src/MagnumPlugins/AnyImageImporter/CMakeLists.txt | 4 ++-- src/MagnumPlugins/AnySceneImporter/CMakeLists.txt | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 57255ac32..1b84bfad1 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -146,6 +146,12 @@ See also: - @ref Trade::ObjImporter "ObjImporter" didn't work with CMake subprojects due to an embarrassing typo (see [mosra/magnum#259](https://github.com/mosra/magnum/issues/259)) +- @ref Audio::AnyImporter "AnyAudioImporter", + @ref Trade::AnyImageConverter "AnyImageConverter", + @ref Trade::AnyImageImporter "AnyImageImporter" and + @ref Trade::AnySceneImporter "AnySceneImporter" plugins were not correctly + updated for subproject support after moving them out of the `magnum-plugins` + repository @subsection changelog-latest-bugfixes Bug fixes diff --git a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt index 0ec1a2f0a..c0e2d7902 100644 --- a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt +++ b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt @@ -59,5 +59,5 @@ if(BUILD_TESTS) add_subdirectory(Test) endif() -# MagnumPlugins AnyAudioImporter target alias for superprojects -add_library(MagnumPlugins::AnyAudioImporter ALIAS AnyAudioImporter) +# Magnum AnyAudioImporter target alias for superprojects +add_library(Magnum::AnyAudioImporter ALIAS AnyAudioImporter) diff --git a/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt b/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt index f3ad5369d..63939a1d8 100644 --- a/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt @@ -59,5 +59,5 @@ if(BUILD_TESTS) add_subdirectory(Test) endif() -# MagnumPlugins AnyImageConverter target alias for superprojects -add_library(MagnumPlugins::AnyImageConverter ALIAS AnyImageConverter) +# Magnum AnyImageConverter target alias for superprojects +add_library(Magnum::AnyImageConverter ALIAS AnyImageConverter) diff --git a/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt b/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt index ef14ccc8d..4f181006a 100644 --- a/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt @@ -59,5 +59,5 @@ if(BUILD_TESTS) add_subdirectory(Test) endif() -# MagnumPlugins AnyImageImporter target alias for superprojects -add_library(MagnumPlugins::AnyImageImporter ALIAS AnyImageImporter) +# Magnum AnyImageImporter target alias for superprojects +add_library(Magnum::AnyImageImporter ALIAS AnyImageImporter) diff --git a/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt b/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt index 35bfdc22a..7709b6f20 100644 --- a/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt +++ b/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt @@ -59,5 +59,5 @@ if(BUILD_TESTS) add_subdirectory(Test) endif() -# MagnumPlugins AnySceneImporter target alias for superprojects -add_library(MagnumPlugins::AnySceneImporter ALIAS AnySceneImporter) +# Magnum AnySceneImporter target alias for superprojects +add_library(Magnum::AnySceneImporter ALIAS AnySceneImporter)