← Back to branch summary

~mterry/ubuntu-calculator-app/confined

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Bartosz Kosiorek
  • Date: 2015-06-25 20:38:31 UTC
  • mto: This revision was merged to the branch mainline in revision 200.
  • Revision ID: gang65@poczta.onet.pl-20150625203831-0oayqaqnl0x0guk3
Fixes after review

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                        calculator-app)
 
30
set(APP_NAME                        ubuntu-calculator-app)
31
31
set(APP_HARDCODE                    ubuntu-calculator-app)
32
32
set(AUTOPILOT_DIR                   ubuntu_calculator_app)
33
33
set(MAIN_QML                        ${APP_HARDCODE}.qml)
79
79
else(CLICK_MODE)
80
80
  set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${ICON_FILE})
81
81
  set(EXEC ${APP_NAME})
82
 
  configure_file(app/${APP_NAME}.in
83
 
    ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME})
84
 
  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME}
 
82
  configure_file(app/${APP_HARDCODE}.in
 
83
    ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
 
84
  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
85
85
    DESTINATION ${CMAKE_INSTALL_BINDIR})
86
86
endif(CLICK_MODE)
87
87