From d442cb964e216b61870ddac86af45e094c8c41a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 23 Jul 2013 13:52:07 +0200 Subject: [PATCH] Explicitly specify library types for *TestLib targets. Use static libraries for plugins which aren't used as dependencies (as they don't export any symbols anyway), use shared libraries for plugins used as dependencies (as they already export the symbols and static libraries cause linker errors on mingw32). --- src/Plugins/MagnumFont/CMakeLists.txt | 2 +- src/Plugins/MagnumFontConverter/CMakeLists.txt | 2 +- src/Plugins/TgaImageConverter/CMakeLists.txt | 2 +- src/Plugins/TgaImporter/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Plugins/MagnumFont/CMakeLists.txt b/src/Plugins/MagnumFont/CMakeLists.txt index 82c4061e9..23c3d855b 100644 --- a/src/Plugins/MagnumFont/CMakeLists.txt +++ b/src/Plugins/MagnumFont/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries(MagnumFont install(FILES ${MagnumFont_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFont) if(BUILD_GL_TESTS) - add_library(MagnumFontTestLib $) + add_library(MagnumFontTestLib STATIC $) target_link_libraries(MagnumFontTestLib ${MAGNUM_LIBRARIES} ${MAGNUM_TEXT_LIBRARIES} diff --git a/src/Plugins/MagnumFontConverter/CMakeLists.txt b/src/Plugins/MagnumFontConverter/CMakeLists.txt index 9e023e56e..12804b7e5 100644 --- a/src/Plugins/MagnumFontConverter/CMakeLists.txt +++ b/src/Plugins/MagnumFontConverter/CMakeLists.txt @@ -44,7 +44,7 @@ target_link_libraries(MagnumFontConverter install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFontConverter) if(BUILD_TESTS) - add_library(MagnumFontConverterTestLib $) + add_library(MagnumFontConverterTestLib STATIC $) target_link_libraries(MagnumFontConverterTestLib ${MAGNUM_LIBRARIES} ${MAGNUM_TEXT_LIBRARIES}) diff --git a/src/Plugins/TgaImageConverter/CMakeLists.txt b/src/Plugins/TgaImageConverter/CMakeLists.txt index b28911348..f72e90679 100644 --- a/src/Plugins/TgaImageConverter/CMakeLists.txt +++ b/src/Plugins/TgaImageConverter/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(TgaImageConverter ${MAGNUM_LIBRARIES}) install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter) if(BUILD_TESTS) - add_library(TgaImageConverterTestLib $) + add_library(TgaImageConverterTestLib SHARED $) target_link_libraries(TgaImageConverterTestLib ${MAGNUM_LIBRARIES}) add_subdirectory(Test) endif() diff --git a/src/Plugins/TgaImporter/CMakeLists.txt b/src/Plugins/TgaImporter/CMakeLists.txt index 7bdcff1d8..90b63a1ea 100644 --- a/src/Plugins/TgaImporter/CMakeLists.txt +++ b/src/Plugins/TgaImporter/CMakeLists.txt @@ -41,7 +41,7 @@ target_link_libraries(TgaImporter ${MAGNUM_LIBRARIES}) install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter) if(BUILD_TESTS) - add_library(TgaImporterTestLib $) + add_library(TgaImporterTestLib SHARED $) target_link_libraries(TgaImporterTestLib ${MAGNUM_LIBRARIES}) add_subdirectory(Test) endif()