~mterry/ubuntu-calculator-app/confined

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Tarmac
  • Author(s): Giulio Collura, Giulio Collura
  • Date: 2015-01-03 15:37:06 UTC
  • mfrom: (45.2.8 reboot-scrollable-view)
  • Revision ID: tarmac-20150103153706-c3kk14iqzo55hnnz
Fix CMakeLists when building click packages. ScrollableView to manage history, textentry and keyboard.

Approved by Ubuntu Phone Apps Jenkins Bot, Riccardo Padovani.

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
set(APP_HARDCODE                    ubuntu-calculator-app)
32
32
set(AUTOPILOT_DIR                   ubuntu_calculator_app)
33
33
set(MAIN_QML                        ${APP_HARDCODE}.qml)
34
 
set(ICON                            "graphics/${APP_HARDCODE}.png")
 
34
set(ICON                            "${APP_HARDCODE}.png")
35
35
set(DESKTOP_FILE                    "${APP_HARDCODE}.desktop")
36
36
 
37
37
if(CLICK_MODE)
73
73
 
74
74
  configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
75
75
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
76
 
  install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_PREFIX})
 
76
  install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
77
77
else(CLICK_MODE)
78
78
  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
79
79
endif(CLICK_MODE)