Ubuntu Calculator App

Merge lp:~rpadovani/ubuntu-calculator-app/fix-new-jenkins-build into lp:ubuntu-calculator-app

  1. fix-new-jenkins-build
  2. Merge into trunk
Proposed by Riccardo Padovani on 2015-07-20
Status: Merged
Approved by: Nicholas Skaggs on 2015-07-20
Approved revision: 215
Merged at revision: 215
Proposed branch: lp:~rpadovani/ubuntu-calculator-app/fix-new-jenkins-build
Merge into: lp:ubuntu-calculator-app
Diff against target: 20 lines (+8/-2)
1 file modified
app/CMakeLists.txt (+8/-2)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-calculator-app/fix-new-jenkins-build
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-07-20
Ubuntu Calculator Developers 2015-07-20 Pending
Review via email: mp+265313@code.launchpad.net

Commit Message

Fix new jenkins build

Description of the Change

Fix new jenkins build

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/CMakeLists.txt'
2--- app/CMakeLists.txt 2015-06-23 22:40:30 +0000
3+++ app/CMakeLists.txt 2015-07-20 19:25:09 +0000
4@@ -3,8 +3,14 @@
5 add_custom_target(ubuntu-calculator-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
6 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
7
8-install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
9-install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
10+if(CLICK_MODE)
11+ install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
12+ install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX})
13+else (CLICK_MODE)
14+ install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
15+ install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
16+endif(CLICK_MODE)
17+
18
19 add_subdirectory(engine)
20 add_subdirectory(graphics)

Subscribers

People subscribed via source and target branches