From ce9a9212caef87414e0798720e9fb171f7c29539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 29 Nov 2013 23:57:05 +0100 Subject: [PATCH] Fix linking of tests in static Windows build. Also fixes the "multiple definition" Emscripten issue, which was worked around in f44af271df7b3a593649dc13036e593d57f9213c. --- src/Plugins/TgaImageConverter/CMakeLists.txt | 8 ++------ src/Plugins/TgaImporter/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Plugins/TgaImageConverter/CMakeLists.txt b/src/Plugins/TgaImageConverter/CMakeLists.txt index 87d26761c..ddbb4149a 100644 --- a/src/Plugins/TgaImageConverter/CMakeLists.txt +++ b/src/Plugins/TgaImageConverter/CMakeLists.txt @@ -40,11 +40,7 @@ target_link_libraries(TgaImageConverter Magnum) install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter) if(BUILD_TESTS) - add_library(TgaImageConverterTestLib SHARED $) - # Otherwise llvm-link complains about multiply defined Debug::globalOutput. - # TODO: can this be done properly? - if(NOT CORRADE_TARGET_EMSCRIPTEN) - target_link_libraries(TgaImageConverterTestLib Magnum) - endif() + add_library(TgaImageConverterTestLib ${SHARED_OR_STATIC} $) + target_link_libraries(TgaImageConverterTestLib Magnum) add_subdirectory(Test) endif() diff --git a/src/Plugins/TgaImporter/CMakeLists.txt b/src/Plugins/TgaImporter/CMakeLists.txt index a979859f3..5f87fab56 100644 --- a/src/Plugins/TgaImporter/CMakeLists.txt +++ b/src/Plugins/TgaImporter/CMakeLists.txt @@ -41,7 +41,7 @@ target_link_libraries(TgaImporter Magnum) install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter) if(BUILD_TESTS) - add_library(TgaImporterTestLib SHARED $) + add_library(TgaImporterTestLib ${SHARED_OR_STATIC} $) target_link_libraries(TgaImporterTestLib Magnum) add_subdirectory(Test) endif()