sync-monitor

Merge lp:~fboucault/sync-monitor/crossbuild_fixes into lp:sync-monitor

  1. crossbuild_fixes
  2. Merge into trunk
Proposed by Florian Boucault
Status: Approved
Approved by: Renato Araujo Oliveira Filho
Approved revision: 66
Proposed branch: lp:~fboucault/sync-monitor/crossbuild_fixes
Merge into: lp:sync-monitor
Diff against target: 18 lines (+2/-7)
1 file modified
Ubuntu/SyncMonitor/CMakeLists.txt (+2/-7)
To merge this branch: bzr merge lp:~fboucault/sync-monitor/crossbuild_fixes
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+299203@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
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:66
https://jenkins.canonical.com/system-apps/job/lp-sync-monitor-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/846
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/147/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/846
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/768
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/768
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/768
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/770
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/770/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-3-clickpkg/32

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-sync-monitor-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good.

review: Approve
Reply

Unmerged revisions

66. By Florian Boucault

Fixes for crossbuilding.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu/SyncMonitor/CMakeLists.txt'
2--- Ubuntu/SyncMonitor/CMakeLists.txt 2014-04-25 14:00:57 +0000
3+++ Ubuntu/SyncMonitor/CMakeLists.txt 2016-07-05 18:04:48 +0000
4@@ -13,13 +13,8 @@
5 qt5_use_modules(syncmonitor-qml Core Qml DBus)
6
7
8-execute_process(
9- COMMAND qmake -query QT_INSTALL_QML
10- OUTPUT_VARIABLE QT_INSTALL_QML
11- OUTPUT_STRIP_TRAILING_WHITESPACE
12-)
13-
14-set(SYNCMONITOR_QML_INSTALL_DIR ${QT_INSTALL_QML}/Ubuntu/SyncMonitor)
15+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
16+set(SYNCMONITOR_QML_INSTALL_DIR ${QT_IMPORTS_DIR}/Ubuntu/SyncMonitor)
17 install(TARGETS syncmonitor-qml DESTINATION ${SYNCMONITOR_QML_INSTALL_DIR})
18 install(FILES ${SYNC_MONITOR_QML_FILES} DESTINATION ${SYNCMONITOR_QML_INSTALL_DIR})
19

Subscribers

People subscribed via source and target branches