Merge lp:~nskaggs/ubuntu-filemanager-app/fix-armhf-build into lp:ubuntu-filemanager-app

Proposed by Nicholas Skaggs on 2014-03-18
Status: Merged
Approved by: Nicholas Skaggs on 2014-03-26
Approved revision: 145
Merged at revision: 148
Proposed branch: lp:~nskaggs/ubuntu-filemanager-app/fix-armhf-build
Merge into: lp:ubuntu-filemanager-app
Diff against target: 38 lines (+5/-4)
1 file modified
CMakeLists.txt (+5/-4)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-filemanager-app/fix-armhf-build
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

Commit message

Get cmake building properly

Description of the change

Get cmake building properly

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

Still need to include the plugin as part of the build so the resulting click package is sound.

Nicholas Skaggs (nskaggs) wrote :

Merging everything, minus the plugin as it will be delayed.

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6 set(APP_HARDCODE ubuntu-filemanager-app)
7 set(MAIN_QML ${APP_HARDCODE}.qml)
8-set(ICON filemanager64.png)
9+set(ICON_FILE filemanager64.png)
10 set(AUTOPILOT_DIR ubuntu_filemanager_app)
11
12 if(CLICK_MODE)
13@@ -23,13 +23,14 @@
14 set(CMAKE_INSTALL_PREFIX /)
15 set(CMAKE_INSTALL_BINDIR /)
16 set(DATA_DIR /)
17- set(EXEC "qmlscene ${MAIN_QML}")
18+ set(ICON ${ICON_FILE})
19+ set(EXEC "qmlscene -qt5 ${MAIN_QML}")
20 set(DESKTOP_DIR ${DATA_DIR})
21 set(URLS_DIR ${DATA_DIR})
22 else(CLICK_MODE)
23 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
24 set(EXEC ${APP_HARDCODE})
25- set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
26+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
27 configure_file(${APP_HARDCODE}.in
28 ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
29 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
30@@ -49,7 +50,7 @@
31 *.qml *.js *.png *.js *.json)
32 install(DIRECTORY ui components icons
33 DESTINATION ${DATA_DIR})
34-install(FILES ${MAIN_QML} DESTINATION ${DATA_DIR})
35+install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
36
37 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
38 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}

Subscribers

People subscribed via source and target branches