Browse Source

Link CORRADE_PLUGINMANAGER_LIBRARIES to all plugin-enabled executables.

Should fix another bunch of static build errors.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
6dbe31f0f0
  1. 2
      src/Audio/Test/CMakeLists.txt
  2. 2
      src/Text/CMakeLists.txt
  3. 4
      src/Text/Test/CMakeLists.txt
  4. 2
      src/TextureTools/CMakeLists.txt

2
src/Audio/Test/CMakeLists.txt

@ -27,7 +27,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake
include_directories(${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES})
corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioRendererTest RendererTest.cpp LIBRARIES MagnumAudio)
corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio)

2
src/Text/CMakeLists.txt

@ -68,7 +68,7 @@ if(WITH_FONTCONVERTER)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(magnum-fontconverter fontconverter.cpp)
target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES})
target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${CORRADE_PLUGINMANAGER_LIBRARIES} ${X11_LIBRARIES})
install(TARGETS magnum-fontconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
endif()

4
src/Text/Test/CMakeLists.txt

@ -27,8 +27,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake
include_directories(${CMAKE_CURRENT_BINARY_DIR})
corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText)
corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText)
corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText ${CORRADE_PLUGINMANAGER_LIBRARIES})
corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText ${CORRADE_PLUGINMANAGER_LIBRARIES})
corrade_add_test(TextAbstractLayouterTest AbstractLayouterTest.cpp LIBRARIES Magnum MagnumText)
if(BUILD_GL_TESTS)

2
src/TextureTools/CMakeLists.txt

@ -57,7 +57,7 @@ if(WITH_DISTANCEFIELDCONVERTER)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(magnum-distancefieldconverter distancefieldconverter.cpp)
target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES})
target_link_libraries(magnum-distancefieldconverter MagnumTextureTools Magnum MagnumWindowlessGlxApplication ${CORRADE_PLUGINMANAGER_LIBRARIES} ${X11_LIBRARIES})
install(TARGETS magnum-distancefieldconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
endif()

Loading…
Cancel
Save