Merge lp:~fboucault/reminders-app/crossbuild_fixes into lp:reminders-app

Proposed by Florian Boucault
Status: Merged
Approved by: Michael Zanetti
Approved revision: 581
Merged at revision: 581
Proposed branch: lp:~fboucault/reminders-app/crossbuild_fixes
Merge into: lp:reminders-app
Diff against target: 29 lines (+2/-6)
2 files modified
CMakeLists.txt (+1/-5)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~fboucault/reminders-app/crossbuild_fixes
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+299206@code.launchpad.net

Commit message

Fixes for crossbuilding.

Description of the change

Fixes for crossbuilding.

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

lgtm

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-11-02 20:26:37 +0000
+++ CMakeLists.txt 2016-07-05 17:59:26 +0000
@@ -82,11 +82,7 @@
82install(FILES COPYING DESTINATION ${CMAKE_INSTALL_PREFIX})82install(FILES COPYING DESTINATION ${CMAKE_INSTALL_PREFIX})
83else(CLICK_MODE)83else(CLICK_MODE)
84 # components PATH84 # components PATH
85 execute_process(85 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
86 COMMAND qmake -query QT_INSTALL_QML
87 OUTPUT_VARIABLE QT_IMPORTS_DIR
88 OUTPUT_STRIP_TRAILING_WHITESPACE
89 )
90 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})86 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
91 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")87 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
92 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)88 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
9389
=== modified file 'debian/control'
--- debian/control 2016-05-18 12:56:16 +0000
+++ debian/control 2016-07-05 17:59:26 +0000
@@ -10,7 +10,7 @@
10 liboxideqt-qmlplugin,10 liboxideqt-qmlplugin,
11 libssl-dev,11 libssl-dev,
12 pkg-config,12 pkg-config,
13 python3-all,13 python3-all:any,
14 qml-module-qttest,14 qml-module-qttest,
15 qml-module-qt-labs-settings,15 qml-module-qt-labs-settings,
16 qml-module-ubuntu-connectivity,16 qml-module-ubuntu-connectivity,

Subscribers

People subscribed via source and target branches