From 41bea89c04bb56706eaefc3023a8c9e154085fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 5 Apr 2021 18:30:40 +0200 Subject: [PATCH] DebugTools: restore usage of external plugins in the CompareImage test. This was working originally, but got broken when all plugin interfaces got switched to look for plugins next to the library and not in a hardcoded install path. --- src/Magnum/DebugTools/Test/CompareImageTest.cpp | 8 ++++---- src/Magnum/DebugTools/Test/configure.h.cmake | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp index ceaee77fc..82600d78c 100644 --- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp +++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp @@ -1190,7 +1190,7 @@ void CompareImageTest::imageFileExpectedLoadFailed() { } void CompareImageTest::imageFileActualIsCompressed() { - PluginManager::Manager manager; + PluginManager::Manager manager{MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR}; if(manager.load("AnyImageImporter") < PluginManager::LoadState::Loaded || manager.load("DdsImporter") < PluginManager::LoadState::Loaded) CORRADE_SKIP("AnyImageImporter or DdsImporter plugins can't be loaded."); @@ -1213,7 +1213,7 @@ void CompareImageTest::imageFileActualIsCompressed() { } void CompareImageTest::imageFileExpectedIsCompressed() { - PluginManager::Manager manager; + PluginManager::Manager manager{MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR}; if(manager.load("AnyImageImporter") < PluginManager::LoadState::Loaded || manager.load("DdsImporter") < PluginManager::LoadState::Loaded) CORRADE_SKIP("AnyImageImporter or DdsImporter plugins can't be loaded."); @@ -1389,7 +1389,7 @@ void CompareImageTest::imageToFileExpectedLoadFailed() { } void CompareImageTest::imageToFileExpectedIsCompressed() { - PluginManager::Manager manager; + PluginManager::Manager manager{MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR}; if(manager.load("AnyImageImporter") < PluginManager::LoadState::Loaded || manager.load("DdsImporter") < PluginManager::LoadState::Loaded) CORRADE_SKIP("AnyImageImporter or DdsImporter plugins can't be loaded."); @@ -1528,7 +1528,7 @@ void CompareImageTest::fileToImageActualLoadFailed() { } void CompareImageTest::fileToImageActualIsCompressed() { - PluginManager::Manager manager; + PluginManager::Manager manager{MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR}; if(manager.load("AnyImageImporter") < PluginManager::LoadState::Loaded || manager.load("DdsImporter") < PluginManager::LoadState::Loaded) CORRADE_SKIP("AnyImageImporter or DdsImporter plugins can't be loaded."); diff --git a/src/Magnum/DebugTools/Test/configure.h.cmake b/src/Magnum/DebugTools/Test/configure.h.cmake index c00bf210c..fce94fc31 100644 --- a/src/Magnum/DebugTools/Test/configure.h.cmake +++ b/src/Magnum/DebugTools/Test/configure.h.cmake @@ -30,3 +30,17 @@ #define DEBUGTOOLS_TEST_DIR "${DEBUGTOOLS_TEST_DIR}" #define SCREENSHOTTEST_SAVE_DIR "${SCREENSHOTTEST_SAVE_DIR}" #define COMPAREIMAGETEST_SAVE_DIR "${COMPAREIMAGETEST_SAVE_DIR}" + +#ifdef CORRADE_TARGET_WINDOWS +#ifdef CORRADE_IS_DEBUG_BUILD +#define MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_IMPORTER_DEBUG_BINARY_INSTALL_DIR}" +#else +#define MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_IMPORTER_RELEASE_BINARY_INSTALL_DIR}" +#endif +#else +#ifdef CORRADE_IS_DEBUG_BUILD +#define MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_IMPORTER_DEBUG_LIBRARY_INSTALL_DIR}" +#else +#define MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${MAGNUM_PLUGINS_IMPORTER_RELEASE_LIBRARY_INSTALL_DIR}" +#endif +#endif