Browse Source

Link plugins to their dependencies on Windows.

Fixes linker issues, not present anywhere else.
pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
f7f380064c
  1. 5
      src/Plugins/MagnumFont/CMakeLists.txt
  2. 4
      src/Plugins/MagnumFontConverter/CMakeLists.txt

5
src/Plugins/MagnumFont/CMakeLists.txt

@ -41,6 +41,10 @@ target_link_libraries(MagnumFont
${MAGNUM_LIBRARIES} ${MAGNUM_LIBRARIES}
${MAGNUM_TEXT_LIBRARIES}) ${MAGNUM_TEXT_LIBRARIES})
if(WIN32)
target_link_libraries(MagnumFont TgaImporter)
endif()
install(FILES ${MagnumFont_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFont) install(FILES ${MagnumFont_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFont)
if(BUILD_GL_TESTS) if(BUILD_GL_TESTS)
@ -49,5 +53,6 @@ if(BUILD_GL_TESTS)
${MAGNUM_LIBRARIES} ${MAGNUM_LIBRARIES}
${MAGNUM_TEXT_LIBRARIES} ${MAGNUM_TEXT_LIBRARIES}
TgaImporterTestLib) TgaImporterTestLib)
add_subdirectory(Test) add_subdirectory(Test)
endif() endif()

4
src/Plugins/MagnumFontConverter/CMakeLists.txt

@ -41,6 +41,10 @@ target_link_libraries(MagnumFontConverter
${MAGNUM_LIBRARIES} ${MAGNUM_LIBRARIES}
${MAGNUM_TEXT_LIBRARIES}) ${MAGNUM_TEXT_LIBRARIES})
if(WIN32)
target_link_libraries(MagnumFontConverter TgaImageConverter)
endif()
install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFontConverter) install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFontConverter)
if(BUILD_GL_TESTS) if(BUILD_GL_TESTS)

Loading…
Cancel
Save