From 4debf7f48354cbe74145d5bcc6bc4a052c9eeab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 2 Jul 2026 11:38:23 +0200 Subject: [PATCH] modules: add missing libraries and plugins to Corrade dependency lookup. Looks like until now all find_package() calls included the other transitive dependencies as well, so this accidentally worked. But for example with the DebugTools reliance on SceneGraph and Primitives now being deprecated, this may change. --- modules/FindMagnum.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 1886d7528..538467f5c 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -239,7 +239,9 @@ foreach(_magnum_component ${Magnum_FIND_COMPONENTS}) # Unrolling the transitive dependencies here so this doesn't need to be # after resolving inter-component dependencies. Listing also all plugins. - if(_magnum_component MATCHES "^(Audio|DebugTools|MeshTools|Primitives|SceneTools|ShaderTools|Text|TextureTools|Trade|.+Importer|.+ImageConverter|.+Font|.+ShaderConverter)$") + # TODO: DebugTools depends on Trade (and thus PluginManager) only + # optionally, take that into account somehow? + if(_magnum_component MATCHES "^(Audio|DebugTools|MeshTools|Primitives|SceneTools|ShaderTools|Text|TextureTools|Trade|.+Importer|.+ImageConverter|.+SceneConverter|.+Font|.+FontConverter|.+ShaderConverter)$") list(APPEND _MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES PluginManager) endif() if(_magnum_component STREQUAL DebugTools) @@ -252,6 +254,9 @@ foreach(_magnum_component ${Magnum_FIND_COMPONENTS}) list(APPEND _MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES TestSuite) endif() endif() + if(_magnum_component STREQUAL OpenGLTester) + list(APPEND _MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES TestSuite) + endif() list(APPEND _MAGNUM_CORRADE_DEPENDENCIES ${_MAGNUM_${_magnum_component}_CORRADE_DEPENDENCIES}) endforeach()