Merge lp:~sergiusens/ubuntu-terminal-app/icon into lp:ubuntu-terminal-app

Proposed by Sergio Schvezov
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~sergiusens/ubuntu-terminal-app/icon
Merge into: lp:ubuntu-terminal-app
Diff against target: 34 lines (+4/-3)
1 file modified
CMakeLists.txt (+4/-3)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-terminal-app/icon
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+207830@code.launchpad.net

Commit message

Install the icon

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-13 02:17:57 +0000
3+++ CMakeLists.txt 2014-02-23 16:14:34 +0000
4@@ -12,7 +12,7 @@
5 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6 set(APP_HARDCODE ubuntu-terminal-app)
7 set(MAIN_QML ubuntu-terminal-app.qml)
8-set(ICON terminal64.png)
9+set(ICON_FILE terminal64.png)
10 set(AUTOPILOT_DIR ubuntu_terminal_app)
11
12 if(CLICK_MODE)
13@@ -26,10 +26,11 @@
14 set(EXEC "qmlscene ${MAIN_QML}")
15 set(DESKTOP_DIR ${DATA_DIR})
16 set(URLS_DIR ${DATA_DIR})
17+ set(ICON ${ICON_FILE})
18 else(CLICK_MODE)
19 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
20 set(EXEC ${APP_HARDCODE})
21- set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
22+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
23 configure_file(${APP_HARDCODE}.in
24 ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
25 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
26@@ -49,7 +50,7 @@
27 *.qml *.js *.png *.js)
28 install(DIRECTORY config extraPanel DESTINATION ${DATA_DIR})
29 install(FILES Terminal.qml Configs.qml DESTINATION ${DATA_DIR})
30-install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
31+install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
32
33 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
34 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}

Subscribers

People subscribed via source and target branches