Merge branch 'master' into compatibility

11 years ago · badf53b9c0
2 changed files with 2 additions and 2 deletions
--- a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
+++ b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
@ -59,7 +59,7 @@ endif()
 target_link_libraries(TgaImageConverter Magnum)

 install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter/configure.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter)

 if(BUILD_TESTS)
    add_library(MagnumTgaImageConverterTestLib STATIC $<TARGET_OBJECTS:TgaImageConverterObjects>)
--- a/src/MagnumPlugins/TgaImporter/CMakeLists.txt
+++ b/src/MagnumPlugins/TgaImporter/CMakeLists.txt
@ -60,7 +60,7 @@ endif()
 target_link_libraries(TgaImporter Magnum)

 install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter/configure.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter)

 if(BUILD_TESTS)
    add_library(MagnumTgaImporterTestLib STATIC $<TARGET_OBJECTS:TgaImporterObjects>)