From 9ec10b89d08bf8df6070aa6e814fad0d8fb5219c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 May 2019 16:01:55 +0200 Subject: [PATCH] plugins: fix linking of static Any* plugins on otherwise dynamic builds. --- doc/changelog.dox | 2 ++ src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt | 2 +- src/MagnumPlugins/AnyImageConverter/CMakeLists.txt | 2 +- src/MagnumPlugins/AnyImageImporter/CMakeLists.txt | 2 +- src/MagnumPlugins/AnySceneImporter/CMakeLists.txt | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 0eecfdcf3..8b33568c0 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -297,6 +297,8 @@ See also: scripts and `FindMagnum.cmake` always forced GLVND) - `FindMagnum.cmake` now correctly finds debug versions of statically built plugins when using Vcpkg +- Fixed linking of static `Any*` plugins when the libraries are otherwise + build as dynamic @subsection changelog-latest-bugfixes Bug fixes diff --git a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt index aee3f11c2..077502c36 100644 --- a/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt +++ b/src/MagnumPlugins/AnyAudioImporter/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(Corrade REQUIRED PluginManager) -if(BUILD_STATIC) +if(BUILD_PLUGINS_STATIC) set(MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC 1) endif() diff --git a/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt b/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt index 37741b5e6..4c4ebfdcc 100644 --- a/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageConverter/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(Corrade REQUIRED PluginManager) -if(BUILD_STATIC) +if(BUILD_PLUGINS_STATIC) set(MAGNUM_ANYIMAGECONVERTER_BUILD_STATIC 1) endif() diff --git a/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt b/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt index 90dfed8c8..16069238e 100644 --- a/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageImporter/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(Corrade REQUIRED PluginManager) -if(BUILD_STATIC) +if(BUILD_PLUGINS_STATIC) set(MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC 1) endif() diff --git a/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt b/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt index 62de31b15..b68cff3b6 100644 --- a/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt +++ b/src/MagnumPlugins/AnySceneImporter/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(Corrade REQUIRED PluginManager) -if(BUILD_STATIC) +if(BUILD_PLUGINS_STATIC) set(MAGNUM_ANYSCENEIMPORTER_BUILD_STATIC 1) endif()