Guest User

Untitled

a guest
Apr 3rd, 2015
276
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/Translations.cmake b/Translations.cmake
  2. index 11fdd93..2c45730 100644
  3. --- a/cmake/Translations.cmake
  4. +++ b/cmake/Translations.cmake
  5. @@ -25,28 +25,6 @@ macro (add_translations_directory NLS_PACKAGE)
  6.              share/locale/${PO_INPUT_BASE}/LC_MESSAGES
  7.              RENAME ${NLS_PACKAGE}.mo)
  8.      endforeach (PO_INPUT ${PO_FILES})
  9. -    #Create *.desktop files
  10. -    file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/*.desktop.plugin.in)
  11. -    foreach(PLUGIN_DESKTOP_IN_FILE ${SOURCE_FILES})
  12. -        get_filename_component( BASE_NAME ${PLUGIN_DESKTOP_IN_FILE} NAME )
  13. -        string(REGEX REPLACE ".desktop.plugin.in$" "" PLUGIN_FILE ${BASE_NAME})
  14. -        get_filename_component( BASE_DIRECTORY ${PLUGIN_DESKTOP_IN_FILE} PATH )
  15. -        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} --desktop --keyword=Name --keyword=Description --keyword=Help -d ${CMAKE_CURRENT_BINARY_DIR} --template ${CMAKE_SOURCE_DIR}/${PLUGIN_DESKTOP_IN_FILE} -o ${CMAKE_BINARY_DIR}/${BASE_DIRECTORY}/${PLUGIN_FILE}.plugin)
  16. -    endforeach()
  17. -    file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/*.desktop.in)
  18. -    foreach(DESKTOP_IN_FILE ${SOURCE_FILES})
  19. -        get_filename_component( BASE_NAME ${DESKTOP_IN_FILE} NAME )
  20. -        string(REGEX REPLACE ".desktop.in$" "" PLUGIN_FILE ${BASE_NAME})
  21. -        get_filename_component( BASE_DIRECTORY ${DESKTOP_IN_FILE} PATH )
  22. -        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} --desktop -d ${CMAKE_CURRENT_BINARY_DIR} --template ${CMAKE_SOURCE_DIR}/${DESKTOP_IN_FILE} -o ${CMAKE_BINARY_DIR}/${BASE_DIRECTORY}/${PLUGIN_FILE}.desktop)
  23. -    endforeach()
  24. -    file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_SOURCE_DIR}/ ${CMAKE_SOURCE_DIR}/*.desktop.xfce.in)
  25. -    foreach(XFCE_DESKTOP_IN_FILE ${SOURCE_FILES})
  26. -        get_filename_component( BASE_NAME ${XFCE_DESKTOP_IN_FILE} NAME )
  27. -        string(REGEX REPLACE ".desktop.xfce.in$" "" PLUGIN_FILE ${BASE_NAME})
  28. -        get_filename_component( BASE_DIRECTORY ${XFCE_DESKTOP_IN_FILE} PATH )
  29. -        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} --desktop --keyword=Name --keyword=Comment --keyword=Help -d ${CMAKE_CURRENT_BINARY_DIR} --template ${CMAKE_SOURCE_DIR}/${XFCE_DESKTOP_IN_FILE} -o ${CMAKE_BINARY_DIR}/${BASE_DIRECTORY}/${PLUGIN_FILE}.desktop)
  30. -    endforeach()
  31.  endmacro (add_translations_directory)
  32.  
  33. --- a/data/xfce/CMakeLists.txt
  34. +++ b/data/xfce/CMakeLists.txt
  35. @@ -1 +1 @@
  36. -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appmenu.desktop DESTINATION share/xfce4/panel/plugins)
  37. +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/appmenu.desktop.xfce.in DESTINATION share/xfce4/panel/plugins RENAME appmenu.desktop)
RAW Paste Data