From ad4f98ea56af0ce143b369abf55e35c22f29e3b5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 18 Oct 2013 14:46:46 -0500 Subject: fix .desktop file generation in CMake --- data/CMakeLists.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'data/CMakeLists.txt') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index f0738b3..76a348e 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -58,17 +58,8 @@ if (BUILD_PANEL) set (DESKTOP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_NAME}") set (DESKTOP_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${DESKTOP_NAME}.in") set (ENV{LC_ALL} "C") - execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${DESKTOP_FILE_IN}" "${DESKTOP_FILE}") + execute_process (COMMAND intltool-merge -quiet --desktop-style --utf8 "${CMAKE_SOURCE_DIR}/po" "${DESKTOP_FILE_IN}" "${DESKTOP_FILE}") install (FILES ${DESKTOP_FILE} DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") endif () - -#if BUILD_CCPANEL -# @INTLTOOL_DESKTOP_RULE@ -# desktopdir = $(datadir)/applications -# desktop_DATA = gnome-indicator-datetime-panel.desktop -# EXTRA_DIST += $(desktop_DATA) -# CLEANFILES += $(desktop_DATA) -#endif -#EXTRA_DIST += datetime-dialog.ui $(desktop_DATA:.desktop=.desktop.in) -- cgit v1.2.3