Commit 05c6e8fd authored by Adam Dingle's avatar Adam Dingle

Fixed #5755 (update icon cache after uninstall).

parent 88f0b2c6
......@@ -49,14 +49,6 @@ else ()
message(STATUS "xgettext not found")
endif ()
add_subdirectory(src)
add_subdirectory(icons)
add_subdirectory(sql)
add_subdirectory(theming)
add_subdirectory(ui)
add_subdirectory(help)
add_subdirectory(desktop)
#
# Uninstall target
#
......@@ -67,13 +59,21 @@ configure_file(
)
add_custom_target(
uninstall
uninstall-base
COMMAND
${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
COMMAND
${glib_schema_compiler} ${GSETTINGS_DIR}
)
add_custom_target(
uninstall
)
# We add this dependency using add_dependencies (which makes it run first) rather than
# a depends clause in add_custom_target (which would make it run last).
add_dependencies(uninstall uninstall-base)
# Dist
# This generates the dist tarballs
add_custom_target(
......@@ -110,3 +110,11 @@ add_custom_target(
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_BASE_NAME}"
)
add_subdirectory(desktop)
add_subdirectory(help)
add_subdirectory(icons)
add_subdirectory(sql)
add_subdirectory(src)
add_subdirectory(theming)
add_subdirectory(ui)
......@@ -18,11 +18,11 @@ if (DESKTOP_UPDATE)
add_custom_target(
uninstall-desktop-update
DEPENDS
uninstall
COMMAND
update-desktop-database
)
add_dependencies(uninstall uninstall-desktop-update)
else ()
install(
CODE "message (STATUS \"Not updating desktop database\")"
......
......@@ -45,10 +45,10 @@ if (ICON_UPDATE)
add_custom_target(
uninstall-icon-cache
DEPENDS
uninstall
COMMAND
gtk-update-icon-cache -t -f ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
)
add_dependencies(uninstall uninstall-icon-cache)
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