[geary/pantheon_mail: 23/32] install .desktops



commit bcc3282d1f887e89aa7a35151593212e4cd417bf
Author: Daniel Foré <daniel elementary io>
Date:   Tue Nov 24 09:41:11 2015 -0800

    install .desktops

 cmake/FindDesktopFileValidate.cmake |   20 --------------------
 data/CMakeLists.txt                 |   15 +++++----------
 2 files changed, 5 insertions(+), 30 deletions(-)
---
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 6642e44..6d70379 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,17 +2,12 @@
 # Build and install geary.desktop
 #
 
-install(FILES geary.appdata.xml DESTINATION share/appdata)
+configure_file(geary.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop)
+configure_file(geary-autostart.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop)
 
-include (FindDesktopFileValidate)
-if (DESKTOP_VALIDATE)
-    if (DESKTOP_FILE_VALIDATE_FOUND)
-        VALIDATE_DESKTOP_FILE (geary)
-        VALIDATE_DESKTOP_FILE (geary-autostart)
-    else (DESKTOP_FILE_VALIDATE_FOUND)
-        message (FATAL_ERROR "desktop-file-validate must be installed to validate generated .desktop file")
-    endif (DESKTOP_FILE_VALIDATE_FOUND)
-endif (DESKTOP_VALIDATE)
+install(FILES geary.appdata.xml DESTINATION share/appdata)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geary.desktop DESTINATION share/applications)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop DESTINATION share/applications)
 
 # Optional: run update-desktop-database at install time.
 # (This has to happen after the geary.desktop file is installed.)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]