Changeset View
Changeset View
Standalone View
Standalone View
graphics/darktable/files/patch-data_CMakeLists.txt
| --- data/CMakeLists.txt.orig 2015-07-26 11:47:47 UTC | --- data/CMakeLists.txt.orig 2015-11-29 19:36:19 UTC | ||||
| +++ data/CMakeLists.txt | +++ data/CMakeLists.txt | ||||
| @@ -39,21 +39,21 @@ if(USE_LUA) | @@ -85,7 +85,7 @@ if(APPLE) | ||||
| # | set(DEFCONFIG_AUDIOPLAYER "afplay") | ||||
| # lua system scripts | endif(APPLE) | ||||
| # | configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.xml.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.xml ) | ||||
| -install(DIRECTORY "lua" DESTINATION ${SHARE_INSTALL}/darktable/) | -execute_process( COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd) | ||||
| -install(FILES luarc DESTINATION ${SHARE_INSTALL}/darktable/) | +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/darktableconfig.dtd.in ${CMAKE_CURRENT_BINARY_DIR}/darktableconfig.dtd ) | ||||
| +install(DIRECTORY "lua" DESTINATION ${SHARE_INSTALL}/darktable) | |||||
| +install(FILES luarc DESTINATION ${SHARE_INSTALL}/darktable) | |||||
| endif(USE_LUA) | |||||
| # | |||||
| # Install (and generate when necessary) other system shares | |||||
| # | |||||
| file(GLOB PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../po/*.po") | |||||
| add_custom_command( | |||||
| - OUTPUT darktable.desktop | |||||
| - SOURCE darktable.desktop.in | |||||
| + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop | |||||
| + SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in | |||||
| COMMAND ${intltool_merge_BIN} -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop | |||||
| MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in | |||||
| DEPENDS ${PO_FILES} | |||||
| ) | |||||
| -add_custom_target(darktable.desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop) | |||||
| +add_custom_target(darktable.desktop_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop) | |||||
| install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop DESTINATION ./share/applications) | |||||
| install(FILES darktable.appdata.xml DESTINATION ./share/appdata) | |||||
| @@ -116,7 +116,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltp | |||||
| endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND") | |||||
| endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND") | |||||
| -add_custom_target(darktablerc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc) | if(USE_XMLLINT) | ||||
| +add_custom_target(darktablerc_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc) | |||||
| # first of all install darktablerc file into share as template | |||||
| # postinst script should copy this into users homedirectory | |||||