← Back to branch summary

~ubuntu-clock-dev/ubuntu-clock-app/reboot-packaging

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Nekhelesh Ramananthan
  • Date: 2014-07-08 10:52:02 UTC
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: krnekhelesh@gmail.com-20140708105202-81bpiuf3voetmem3
Fixed missing desktop icon path and also renamed application name to Clock reboot to distuinguish on the phone

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
1
 
project(com.ubuntu.clock C CXX)
 
1
project(com.ubuntu.clock.devel C CXX)
2
2
cmake_minimum_required(VERSION 2.8.9)
3
3
 
4
4
set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
18
18
set(APP_NAME                clock)
19
19
set(APP_HARDCODE            ubuntu-clock-app)
20
20
set(MAIN_QML                ${APP_HARDCODE}.qml)
21
 
set(ICON                    "share/app/clock_app@30.png")
 
21
set(ICON                    clock-app@30.png)
22
22
 
23
23
#set install paths
24
24
if(${CLICK_MODE})
25
25
  set(CMAKE_INSTALL_PREFIX /)
26
26
  set(DATA_DIR /)
27
27
  set(DESKTOP_DIR ${DATA_DIR})
28
 
  set(ICON ".${DATA_DIR}/${ICON}")
29
28
  set(UBUNTU-CLOCK-APP_DIR    "share/qml/ubuntu-clock-app")
 
29
  set(ICON "${UBUNTU-CLOCK-APP_DIR}/${ICON}")
30
30
 
31
31
  execute_process(
32
32
      COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
37
37
else()
38
38
  set(DATA_DIR "share/clockapp")
39
39
  set(DESKTOP_DIR ${DATA_DIR})
40
 
  set(ICON ".${DATA_DIR}/${ICON}")
 
40
  set(ICON "${DATA_DIR}/${ICON}")
41
41
  set(UBUNTU-CLOCK-APP_DIR    "share/ubuntu-clock-app/qml")
42
42
  include(GNUInstallDirs)
43
43
  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")