ubuntu-touch-coreapps-reviewers team mailing list archive

[Riccardo Padovani <riccardo@xxxxxxxxxxxxx>]

Riccardo Padovani has proposed merging lp:~rpadovani/ubuntu-calculator-app/fix-new-jenkins-build into lp:ubuntu-calculator-app.

Commit message:
Fix new jenkins build

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)

For more details, see:
https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/fix-new-jenkins-build/+merge/265313

Fix new jenkins build
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~rpadovani/ubuntu-calculator-app/fix-new-jenkins-build into lp:ubuntu-calculator-app.

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-06-23 22:40:30 +0000
+++ app/CMakeLists.txt	2015-07-20 19:25:09 +0000
@@ -3,8 +3,14 @@
   add_custom_target(ubuntu-calculator-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
-install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
-install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
+if(CLICK_MODE)
+  install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX})
+else (CLICK_MODE)
+  install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
+  install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
+endif(CLICK_MODE)
+
 
 add_subdirectory(engine)
 add_subdirectory(graphics)