aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-10-18 14:46:46 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-10-18 14:46:46 -0500
commitad4f98ea56af0ce143b369abf55e35c22f29e3b5 (patch)
tree8faed74e8ae6db720baf19d0ad0231bd19ceaa85 /data
parent62d01fc8749606d8fc4614d897044462a6d703fc (diff)
downloadayatana-indicator-datetime-ad4f98ea56af0ce143b369abf55e35c22f29e3b5.tar.gz
ayatana-indicator-datetime-ad4f98ea56af0ce143b369abf55e35c22f29e3b5.tar.bz2
ayatana-indicator-datetime-ad4f98ea56af0ce143b369abf55e35c22f29e3b5.zip
fix .desktop file generation in CMake
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt11
1 files changed, 1 insertions, 10 deletions
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)