Browse Source

Merge branch 'master' into compatibility

Vladimír Vondruš 12 years ago
parent
commit
24a03cd9ac
  1. 3
      modules/FindMagnum.cmake
  2. 1
      src/MagnumPlugins/MagnumFont/CMakeLists.txt
  3. 1
      src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
  4. 1
      src/MagnumPlugins/ObjImporter/CMakeLists.txt
  5. 1
      src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
  6. 1
      src/MagnumPlugins/TgaImporter/CMakeLists.txt
  7. 1
      src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

3
modules/FindMagnum.cmake

@ -96,6 +96,7 @@
# MAGNUM_*_LIBRARY - Component libraries (w/o dependencies)
# MAGNUM_*_LIBRARY_DEBUG - Debug version of given library, if found
# MAGNUM_*_LIBRARY_RELEASE - Release version of given library, if found
# MAGNUM_BINARY_INSTALL_DIR - Binary installation directory
# MAGNUM_LIBRARY_INSTALL_DIR - Library installation directory
# MAGNUM_PLUGINS_[DEBUG|RELEASE]_INSTALL_DIR - Plugin installation directory
# MAGNUM_PLUGINS_FONT_[DEBUG|RELEASE]_INSTALL_DIR - Font plugin installation
@ -460,6 +461,7 @@ find_package_handle_standard_args(Magnum
# Installation dirs
include(CorradeLibSuffix)
set(MAGNUM_BINARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
set(MAGNUM_LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
set(MAGNUM_PLUGINS_DEBUG_INSTALL_DIR ${MAGNUM_LIBRARY_INSTALL_DIR}/magnum-d)
set(MAGNUM_PLUGINS_RELEASE_INSTALL_DIR ${MAGNUM_LIBRARY_INSTALL_DIR}/magnum)
@ -481,6 +483,7 @@ mark_as_advanced(FORCE
MAGNUM_LIBRARY_RELEASE
MAGNUM_LIBRARY
MAGNUM_INCLUDE_DIR
MAGNUM_BINARY_INSTALL_DIR
MAGNUM_LIBRARY_INSTALL_DIR
MAGNUM_PLUGINS_DEBUG_INSTALL_DIR
MAGNUM_PLUGINS_RELEASE_INSTALL_DIR

1
src/MagnumPlugins/MagnumFont/CMakeLists.txt

@ -46,6 +46,7 @@ install(FILES ${MagnumFont_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL
if(BUILD_GL_TESTS)
add_library(MagnumMagnumFontTestLib STATIC $<TARGET_OBJECTS:MagnumFontObjects>)
set_target_properties(MagnumMagnumFontTestLib PROPERTIES DEBUG_POSTFIX "-d")
target_link_libraries(MagnumMagnumFontTestLib Magnum MagnumText MagnumTgaImporterTestLib)
# On Windows we need to install first and then run the tests to avoid "DLL

1
src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt

@ -46,6 +46,7 @@ install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUD
if(BUILD_GL_TESTS)
add_library(MagnumMagnumFontConverterTestLib STATIC $<TARGET_OBJECTS:MagnumFontConverterObjects>)
set_target_properties(MagnumMagnumFontConverterTestLib PROPERTIES DEBUG_POSTFIX "-d")
target_link_libraries(MagnumMagnumFontConverterTestLib Magnum MagnumText MagnumTgaImageConverterTestLib)
# On Windows we need to install first and then run the tests to avoid "DLL

1
src/MagnumPlugins/ObjImporter/CMakeLists.txt

@ -38,6 +38,7 @@ install(FILES ObjImporter.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/Ob
if(BUILD_TESTS)
add_library(MagnumObjImporterTestLib STATIC $<TARGET_OBJECTS:ObjImporterObjects>)
set_target_properties(MagnumObjImporterTestLib PROPERTIES DEBUG_POSTFIX "-d")
target_link_libraries(MagnumObjImporterTestLib Magnum MagnumMeshTools)
# On Windows we need to install first and then run the tests to avoid "DLL

1
src/MagnumPlugins/TgaImageConverter/CMakeLists.txt

@ -42,6 +42,7 @@ install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_
if(BUILD_TESTS)
add_library(MagnumTgaImageConverterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImageConverterObjects>)
set_target_properties(MagnumTgaImageConverterTestLib PROPERTIES DEBUG_POSTFIX "-d")
target_link_libraries(MagnumTgaImageConverterTestLib Magnum)
# On Windows we need to install first and then run the tests to avoid "DLL

1
src/MagnumPlugins/TgaImporter/CMakeLists.txt

@ -43,6 +43,7 @@ install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTAL
if(BUILD_TESTS)
add_library(MagnumTgaImporterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImporterObjects>)
set_target_properties(MagnumTgaImporterTestLib PROPERTIES DEBUG_POSTFIX "-d")
target_link_libraries(MagnumTgaImporterTestLib Magnum)
# On Windows we need to install first and then run the tests to avoid "DLL

1
src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

@ -49,6 +49,7 @@ install(FILES ${WavAudioImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_I
if(BUILD_TESTS)
add_library(MagnumWavAudioImporterTestLib STATIC $<TARGET_OBJECTS:WavAudioImporterObjects>)
set_target_properties(MagnumWavAudioImporterTestLib PROPERTIES DEBUG_POSTFIX "-d")
target_link_libraries(MagnumWavAudioImporterTestLib Magnum MagnumAudio)
# On Windows we need to install first and then run the tests to avoid "DLL

Loading…
Cancel
Save