From 05c6e8fd98e77cf3f6411ce75a94576dcb48c759 Mon Sep 17 00:00:00 2001
From: Adam Dingle <adam@yorba.org>
Date: Fri, 14 Sep 2012 09:54:52 -0700
Subject: [PATCH] Fixed #5755 (update icon cache after uninstall).

---
 CMakeLists.txt         | 26 +++++++++++++++++---------
 desktop/CMakeLists.txt |  4 ++--
 icons/CMakeLists.txt   |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92dd511f..86f36cf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
+
diff --git a/desktop/CMakeLists.txt b/desktop/CMakeLists.txt
index ba72af3c..8173aaee 100644
--- a/desktop/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -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\")"
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index a758a47a..17989942 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -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 ()