Merge lp:~sergiusens/ubuntu-clock-app/icon into lp:ubuntu-clock-app/saucy

[Sergio Schvezov]

icon install rule when using cmake

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

FAILED: Continuous integration, rev:348
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/270/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1420/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/270/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/270/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/188/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/133/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1421/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/133/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/133/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/69/console

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:349
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/271/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1422
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/271
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/271
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/189

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-18 21:11:37 +0000
+++ CMakeLists.txt	2014-02-19 21:06:02 +0000
@@ -12,7 +12,7 @@
 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 set(APP_HARDCODE ubuntu-clock-app)
 set(MAIN_QML ${APP_HARDCODE}.qml)
-set(ICON [e-mail])
+set(ICON_FILE [e-mail])
 set(AUTOPILOT_DIR ubuntu_clock_app)
 
 if(CLICK_MODE)
@@ -23,13 +23,14 @@
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
+	set(ICON ${ICON_FILE})
     set(EXEC "qmlscene ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(EXEC ${APP_HARDCODE})
-    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
+	set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
     configure_file(${APP_HARDCODE}.in
         ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
@@ -49,7 +50,7 @@
      *.qml *.js *.png *.js)
 install(DIRECTORY alarm clock common images stopwatch timer
     DESTINATION ${DATA_DIR})
-install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
+install(FILES ${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}