1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2014-02-19 00:00:15 +0000
3
+++ CMakeLists.txt	2014-03-26 14:25:58 +0000
4
@@ -12,7 +12,7 @@
5
12
set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
12
set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6
13
set(APP_HARDCODE ubuntu-filemanager-app)
13
set(APP_HARDCODE ubuntu-filemanager-app)
7
14
set(MAIN_QML ${APP_HARDCODE}.qml)
14
set(MAIN_QML ${APP_HARDCODE}.qml)
9
15
set(ICON filemanager64.png)
15
set(ICON_FILE filemanager64.png)
10
16
set(AUTOPILOT_DIR ubuntu_filemanager_app)
16
set(AUTOPILOT_DIR ubuntu_filemanager_app)
11
17
17
12
18
if(CLICK_MODE)
18
if(CLICK_MODE)
13
@@ -23,13 +23,14 @@
14
23
    set(CMAKE_INSTALL_PREFIX /)
23
    set(CMAKE_INSTALL_PREFIX /)
15
24
    set(CMAKE_INSTALL_BINDIR /)
24
    set(CMAKE_INSTALL_BINDIR /)
16
25
    set(DATA_DIR /)
25
    set(DATA_DIR /)
18
26
    set(EXEC "qmlscene ${MAIN_QML}")
26
    set(ICON ${ICON_FILE})
19
27
    set(EXEC "qmlscene -qt5 ${MAIN_QML}")
20
27
    set(DESKTOP_DIR ${DATA_DIR})
28
    set(DESKTOP_DIR ${DATA_DIR})
21
28
    set(URLS_DIR ${DATA_DIR})
29
    set(URLS_DIR ${DATA_DIR})
22
29
else(CLICK_MODE)
30
else(CLICK_MODE)
23
30
    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
31
    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
24
31
    set(EXEC ${APP_HARDCODE})
32
    set(EXEC ${APP_HARDCODE})
26
32
    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
33
    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
27
33
    configure_file(${APP_HARDCODE}.in
34
    configure_file(${APP_HARDCODE}.in
28
34
        ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
35
        ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
29
35
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
36
    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
30
@@ -49,7 +50,7 @@
31
49
     *.qml *.js *.png *.js *.json)
50
     *.qml *.js *.png *.js *.json)
32
50
install(DIRECTORY ui components icons
51
install(DIRECTORY ui components icons
33
51
    DESTINATION ${DATA_DIR})
52
    DESTINATION ${DATA_DIR})
35
52
install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
53
install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
36
53
54
37
54
configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
55
configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
38
55
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
56
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-03-26
Dimitri John Ledkov		2014-03-20	Pending
Ubuntu File Manager Developers		2014-03-18	Pending
Review via email: mp+211621@code.launchpad.net