← Back to branch summary

~mterry/ubuntu-calculator-app/confined

« back to all changes in this revision

Viewing changes to CMakeLists.txt

Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
27
27
 
28
28
include(GNUInstallDirs)
29
29
 
30
 
set(APP_NAME                        ubuntu-calculator-app)
 
30
set(APP_NAME                        Calculator)
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                            "${APP_HARDCODE}.png")
 
34
set(ICON_FILE                       "${APP_HARDCODE}.png")
35
35
set(DESKTOP_FILE                    "${APP_HARDCODE}.desktop")
36
 
set(AUTOPILOT_DIR                   ubuntu_calculator_app)
37
36
set(APP_VERSION                     2.0)
 
37
set(AUTOPILOT_DIR                   ubuntu_calculator_app)
38
38
 
39
39
if(CLICK_MODE)
40
40
  set(CMAKE_INSTALL_PREFIX "/")
41
41
  set(UBUNTU-CALCULATOR-APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
42
42
 
43
43
  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
44
 
  set(EXEC "qmlscene $@ ${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
45
 
  set(MODULE_PATH ${QT_IMPORTS_DIR})
 
44
  set(EXEC "qmlscene -qt5 $@ ${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
46
45
  if(NOT BZR_REVNO)
47
46
    execute_process(
48
47
      COMMAND bzr revno
76
75
  configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
77
76
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
78
77
  install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
 
78
  set(ICON ${ICON_FILE})
79
79
else(CLICK_MODE)
80
 
  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
 
80
  set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${ICON_FILE})
 
81
  set(EXEC ${APP_HARDCODE})
 
82
  configure_file(app/${APP_HARDCODE}.in
 
83
    ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
 
84
  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
 
85
    DESTINATION ${CMAKE_INSTALL_BINDIR})
81
86
endif(CLICK_MODE)
82
87
 
83
88
file(GLOB_RECURSE I18N_SRC_FILES