Browse Source

Cleanup.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
defc04f6ac
  1. 1
      src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
  2. 2
      src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
  3. 1
      src/MagnumPlugins/TgaImporter/CMakeLists.txt
  4. 2
      src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt

1
src/MagnumPlugins/TgaImageConverter/CMakeLists.txt

@ -64,5 +64,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGI
if(BUILD_TESTS) if(BUILD_TESTS)
add_library(MagnumTgaImageConverterTestLib STATIC $<TARGET_OBJECTS:TgaImageConverterObjects>) add_library(MagnumTgaImageConverterTestLib STATIC $<TARGET_OBJECTS:TgaImageConverterObjects>)
target_link_libraries(MagnumTgaImageConverterTestLib Magnum) target_link_libraries(MagnumTgaImageConverterTestLib Magnum)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()

2
src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt

@ -30,7 +30,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES MagnumTgaImageConverterTestLib MagnumTgaImporterTestLib) corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES MagnumTgaImageConverterTestLib MagnumTgaImporterTestLib)
# On Win32 we need to avoid dllimporting TgaImporter and TgaImageConverterTest # On Win32 we need to avoid dllimporting TgaImporter and TgaImageConverterTest
# symbols, because it would search for the symbols in some DLL even when they # symbols, because it would search for the symbols in some DLL even though they
# were linked statically. However it apparently doesn't matter that they were # were linked statically. However it apparently doesn't matter that they were
# dllexported when building the static library. EH. # dllexported when building the static library. EH.
if(WIN32) if(WIN32)

1
src/MagnumPlugins/TgaImporter/CMakeLists.txt

@ -65,5 +65,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGI
if(BUILD_TESTS) if(BUILD_TESTS)
add_library(MagnumTgaImporterTestLib STATIC $<TARGET_OBJECTS:TgaImporterObjects>) add_library(MagnumTgaImporterTestLib STATIC $<TARGET_OBJECTS:TgaImporterObjects>)
target_link_libraries(MagnumTgaImporterTestLib Magnum) target_link_libraries(MagnumTgaImporterTestLib Magnum)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()

2
src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt

@ -30,7 +30,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES MagnumTgaImporterTestLib) corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES MagnumTgaImporterTestLib)
# On Win32 we need to avoid dllimporting TgaImporter symbols, because it would # On Win32 we need to avoid dllimporting TgaImporter symbols, because it would
# search for the symbols in some DLL even when they were linked statically. # search for the symbols in some DLL even though they were linked statically.
# However it apparently doesn't matter that they were dllexported when building # However it apparently doesn't matter that they were dllexported when building
# the static library. EH. # the static library. EH.
if(WIN32) if(WIN32)

Loading…
Cancel
Save