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

[Victor Thompson]

Add icons to CMakeLists.txt

Add icons to CMakeLists.txt

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

[lp:~vthompson/ubuntu-terminal-app/fix-1283848-add-icons-cmake]

40. By Victor Thompson on 2014-02-24

Install files in one line

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Sergio Schvezov (sergiusens)]

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-23 16:13:39 +0000
+++ CMakeLists.txt	2014-02-24 00:19:30 +0000
@@ -49,8 +49,8 @@
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      *.qml *.js *.png *.js)
 install(DIRECTORY config extraPanel DESTINATION ${DATA_DIR})
-install(FILES Terminal.qml Configs.qml DESTINATION ${DATA_DIR})
-install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
+install(FILES Terminal.qml Configs.qml settings.png [e-mail]
+    ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}