Ubuntu Terminal App

Merge lp:~vthompson/ubuntu-terminal-app/fix-1283848-add-icons-cmake into lp:ubuntu-terminal-app

  1. fix-1283848-add-icons-cmake
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 40
Merged at revision: 39
Proposed branch: lp:~vthompson/ubuntu-terminal-app/fix-1283848-add-icons-cmake
Merge into: lp:ubuntu-terminal-app
Diff against target: 14 lines (+2/-2)
1 file modified
CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~vthompson/ubuntu-terminal-app/fix-1283848-add-icons-cmake
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Sergio Schvezov (community) Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+207848@code.launchpad.net

Commit message

Add icons to CMakeLists.txt

Description of the change

Add icons to CMakeLists.txt

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) :
review: Approve
lp:~vthompson/ubuntu-terminal-app/fix-1283848-add-icons-cmake updated
40. By Victor Thompson

Install files in one line

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:39
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/39/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1485
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/39/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:40
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/40/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1486
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/28

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/40/rebuild

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-23 16:13:39 +0000
3+++ CMakeLists.txt 2014-02-24 00:19:30 +0000
4@@ -49,8 +49,8 @@
5 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
6 *.qml *.js *.png *.js)
7 install(DIRECTORY config extraPanel DESTINATION ${DATA_DIR})
8-install(FILES Terminal.qml Configs.qml DESTINATION ${DATA_DIR})
9-install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
10+install(FILES Terminal.qml Configs.qml settings.png avatar@8.png
11+ ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
12
13 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
14 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}

Subscribers

People subscribed via source and target branches