Merge lp:~jbicha/indicator-session/lp1600502-fix-icon-install into lp:indicator-session

[Jeremy Bícha]

Fix icon installation.

[Michael Terry (mterry)]

Tested. This does fix the double install issue. Seems like you could have just changed

install (DIRECTORY icons

to

install (DIRECTORY

(or dropped all the specific directory names instead)

But this works too.

review: Approve

[Michael Terry (mterry)]

Thanks btw! :) Double icons suck. Was in the review-zone, didn't mean to sound brusque.

[Jeremy Bícha (jbicha)]

No problem. I didn't realize until your comment that the real problem was

install (DIRECTORY icons

Had I used a one-word fix, I bet this would have been reviewed sooner! :)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-02-20 16:19:05 +0000
+++ data/CMakeLists.txt	2016-07-10 16:30:58 +0000
@@ -92,24 +92,4 @@
 install (FILES "${UNITY_INDICATOR_FILE}"
          DESTINATION "${UNITY_INDICATOR_DIR}")
 
-
-##
-##  Icons
-##
-
-# where to install
-set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor")
-message (STATUS "${ICON_DIR} is the Icon install dir")
-
-install (DIRECTORY icons
-         icons/16x16
-         icons/22x22
-         icons/24x24
-         icons/32x32
-         icons/scalable
-         DESTINATION "${ICON_DIR}"
-         FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
-
-install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})"
-        CODE "message (STATUS \"Updating icon cache\")")
-
+add_subdirectory (icons)
 
=== added file 'data/icons/CMakeLists.txt'
--- data/icons/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/icons/CMakeLists.txt	2016-07-10 16:30:58 +0000
@@ -0,0 +1,14 @@
+set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor")
+message (STATUS "${ICON_DIR} is the Icon install dir")
+
+install (DIRECTORY
+         16x16
+         22x22
+         24x24
+         32x32
+         scalable
+         DESTINATION "${ICON_DIR}"
+         FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
+
+install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})"
+        CODE "message (STATUS \"Updating icon cache\")")