Commit 5665a4fc authored by Jim Nelson's avatar Jim Nelson

Install geary.desktop file: Closes #5677

The problem is that the geary.desktop file is installed to
/usr/local/share/applications when PREFIX is /usr/local, which is
not monitored by GNOME.  However, this is okay as long as the
desktop update util is run.  It is, but it was being run *before*
the .desktop file was installed.  This patch fixes it so the update
is run after, which is also how we do things in Shotwell.
parent ed875878
......@@ -43,16 +43,6 @@ add_subdirectory(theming)
add_subdirectory(ui)
add_subdirectory(help)
#
# Install geary.desktop
#
install(
FILES
geary.desktop
DESTINATION
share/applications
)
#
# Uninstall target
#
......@@ -70,24 +60,6 @@ add_custom_target(
${glib_schema_compiler} ${GSETTINGS_DIR}
)
# Optional: run update-desktop-database at install time.
if (DESKTOP_UPDATE)
install(
CODE
"execute_process (COMMAND update-desktop-database)"
CODE
"message (STATUS \"Updating desktop database\")"
)
add_custom_target(
uninstall-desktop-update
DEPENDS
uninstall
COMMAND
update-desktop-database
)
endif ()
# Dist
# This generates the dist tarballs
add_custom_target(
......
......@@ -339,7 +339,7 @@ set(DBUSSERVICE_PACKAGES
gee-1.0 glib-2.0
)
set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/src/client)
set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/src/client/misc)
set(CFLAGS
${DEPS_CFLAGS}
......@@ -412,6 +412,8 @@ add_custom_command(
include(GSettings)
add_schemas(geary ${GSETTINGS_DIR})
add_subdirectory(client)
# Console app
#################################################
vala_precompile(CONSOLE_VALA_C geary-console
......
#
# Install geary.desktop
#
install(
FILES
misc/geary.desktop
DESTINATION
share/applications
)
# GSettings
include(GSettings)
add_schemas(geary ${GSETTINGS_DIR})
# Optional: run update-desktop-database at install time.
# (This has to happen after the geary.desktop file is installed.)
if (DESKTOP_UPDATE)
install(
CODE
"execute_process (COMMAND update-desktop-database)"
CODE
"message (STATUS \"Updating desktop database\")"
)
add_custom_target(
uninstall-desktop-update
DEPENDS
uninstall
COMMAND
update-desktop-database
)
else ()
install(
CODE "message (STATUS \"Not updating desktop database\")"
)
endif ()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment