Files

Merge lp:~pimvullers/pantheon-files/fix-949962 into lp:~elementary-apps/pantheon-files/trunk

  1. fix-949962
  2. Merge into trunk
Proposed by Pim Vullers
Status: Merged
Merged at revision: 812
Proposed branch: lp:~pimvullers/pantheon-files/fix-949962
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 16 lines (+6/-4)
1 file modified
icons/CMakeLists.txt (+6/-4)
To merge this branch: bzr merge lp:~pimvullers/pantheon-files/fix-949962
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+106451@code.launchpad.net

Description of the change

This branch fixes bug #949962 by making the icon cache update optional (using the ICON_UPDATE option)

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'icons/CMakeLists.txt'
2--- icons/CMakeLists.txt 2011-08-08 16:57:40 +0000
3+++ icons/CMakeLists.txt 2012-05-18 19:20:23 +0000
4@@ -1,6 +1,8 @@
5 install(FILES thumbnail_frame.png DESTINATION share/pixmaps/marlin/)
6 install(FILES marlin.svg view-list-column-symbolic.svg view-list-compact-symbolic.svg view-list-details-symbolic.svg view-list-icons-symbolic.svg DESTINATION share/icons/hicolor/scalable/apps/)
7-install (CODE "message(\"-- Update Gtk icon cache...\")
8-")
9-install (CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
10-")
11+
12+option (ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
13+if (ICON_UPDATE)
14+ install (CODE "message(\"-- Updating icon cache...\")")
15+ install (CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)")
16+endif ()

Subscribers

People subscribed via source and target branches

to all changes: