Browse Source

Fix linking of tests in static Windows build.

Also fixes the "multiple definition" Emscripten issue, which was worked
around in f44af271df.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
ce9a9212ca
  1. 8
      src/Plugins/TgaImageConverter/CMakeLists.txt
  2. 2
      src/Plugins/TgaImporter/CMakeLists.txt

8
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 $<TARGET_OBJECTS:TgaImageConverterObjects>)
# 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_OBJECTS:TgaImageConverterObjects>)
target_link_libraries(TgaImageConverterTestLib Magnum)
add_subdirectory(Test)
endif()

2
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 $<TARGET_OBJECTS:TgaImporterObjects>)
add_library(TgaImporterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImporterObjects>)
target_link_libraries(TgaImporterTestLib Magnum)
add_subdirectory(Test)
endif()

Loading…
Cancel
Save