From f7f380064c237eab267d98a446d5f2613c02e3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 23 Jul 2013 14:04:44 +0200 Subject: [PATCH] Link plugins to their dependencies on Windows. Fixes linker issues, not present anywhere else. --- src/Plugins/MagnumFont/CMakeLists.txt | 5 +++++ src/Plugins/MagnumFontConverter/CMakeLists.txt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/Plugins/MagnumFont/CMakeLists.txt b/src/Plugins/MagnumFont/CMakeLists.txt index 23c3d855b..11d09f8e5 100644 --- a/src/Plugins/MagnumFont/CMakeLists.txt +++ b/src/Plugins/MagnumFont/CMakeLists.txt @@ -41,6 +41,10 @@ target_link_libraries(MagnumFont ${MAGNUM_LIBRARIES} ${MAGNUM_TEXT_LIBRARIES}) +if(WIN32) + target_link_libraries(MagnumFont TgaImporter) +endif() + install(FILES ${MagnumFont_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFont) if(BUILD_GL_TESTS) @@ -49,5 +53,6 @@ if(BUILD_GL_TESTS) ${MAGNUM_LIBRARIES} ${MAGNUM_TEXT_LIBRARIES} TgaImporterTestLib) + add_subdirectory(Test) endif() diff --git a/src/Plugins/MagnumFontConverter/CMakeLists.txt b/src/Plugins/MagnumFontConverter/CMakeLists.txt index 9c8694b62..71efa0c47 100644 --- a/src/Plugins/MagnumFontConverter/CMakeLists.txt +++ b/src/Plugins/MagnumFontConverter/CMakeLists.txt @@ -41,6 +41,10 @@ target_link_libraries(MagnumFontConverter ${MAGNUM_LIBRARIES} ${MAGNUM_TEXT_LIBRARIES}) +if(WIN32) + target_link_libraries(MagnumFontConverter TgaImageConverter) +endif() + install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFontConverter) if(BUILD_GL_TESTS)