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

Proposed by Jeremy Bicha on 2016-07-10
Status: Merged
Approved by: Michael Terry on 2016-07-27
Approved revision: 472
Merged at revision: 497
Proposed branch: lp:~jbicha/indicator-session/lp1600502-fix-icon-install
Merge into: lp:indicator-session
Diff against target: 48 lines (+15/-21)
2 files modified
data/CMakeLists.txt (+1/-21)
data/icons/CMakeLists.txt (+14/-0)
To merge this branch: bzr merge lp:~jbicha/indicator-session/lp1600502-fix-icon-install
Reviewer Review Type Date Requested Status
Michael Terry 2016-07-10 Approve on 2016-07-27
Review via email: mp+299625@code.launchpad.net

Commit message

Fix icon installation.

To post a comment you must log in.
Michael Terry (mterry) wrote :

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) wrote :

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

Jeremy Bicha (jbicha) wrote :

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! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-02-20 16:19:05 +0000
3+++ data/CMakeLists.txt 2016-07-10 16:30:58 +0000
4@@ -92,24 +92,4 @@
5 install (FILES "${UNITY_INDICATOR_FILE}"
6 DESTINATION "${UNITY_INDICATOR_DIR}")
7
8-
9-##
10-## Icons
11-##
12-
13-# where to install
14-set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor")
15-message (STATUS "${ICON_DIR} is the Icon install dir")
16-
17-install (DIRECTORY icons
18- icons/16x16
19- icons/22x22
20- icons/24x24
21- icons/32x32
22- icons/scalable
23- DESTINATION "${ICON_DIR}"
24- FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
25-
26-install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})"
27- CODE "message (STATUS \"Updating icon cache\")")
28-
29+add_subdirectory (icons)
30
31=== added file 'data/icons/CMakeLists.txt'
32--- data/icons/CMakeLists.txt 1970-01-01 00:00:00 +0000
33+++ data/icons/CMakeLists.txt 2016-07-10 16:30:58 +0000
34@@ -0,0 +1,14 @@
35+set (ICON_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/icons/hicolor")
36+message (STATUS "${ICON_DIR} is the Icon install dir")
37+
38+install (DIRECTORY
39+ 16x16
40+ 22x22
41+ 24x24
42+ 32x32
43+ scalable
44+ DESTINATION "${ICON_DIR}"
45+ FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
46+
47+install(CODE "execute_process (COMMAND gtk-update-icon-cache -t -f ${ICON_DIR})"
48+ CODE "message (STATUS \"Updating icon cache\")")

Subscribers

People subscribed via source and target branches