QtMir

Merge lp:~pete-woods/qtmir/cmake-extras-compatibility into lp:qtmir

  1. cmake-extras-compatibility
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Michi Henning
Approved revision: 575
Merged at revision: 584
Proposed branch: lp:~pete-woods/qtmir/cmake-extras-compatibility
Merge into: lp:qtmir
Diff against target: 25 lines (+2/-2)
2 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/qtmir/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Approve
Michi Henning (community) Approve
Review via email: mp+312709@code.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Prereq-archive: ppa:ci-train-ppa-service/2274

Compatibility with unversioned cmake-extras modules

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:575
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/424/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3512/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3540
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3387/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3387/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3387/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3387/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3387/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3387/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/424/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good.

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:575
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/428/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3528/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3556
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3403
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3403/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3403/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3403
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3403/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3403/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3403
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3403/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3403/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/428/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:575
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/429/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3529
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3557
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3404
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3404/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3404
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3404/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3404
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3404/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3404
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3404/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3404
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3404/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3404
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3404/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/429/rebuild

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 2016-11-03 16:08:12 +0000
3+++ CMakeLists.txt 2016-12-07 17:07:44 +0000
4@@ -31,7 +31,7 @@
5 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
6
7
8-include(EnableCoverageReport)
9+find_package(CoverageReport)
10 #####################################################################
11 # Enable code coverage calculation with gcov/gcovr/lcov
12 # Usage:
13
14=== modified file 'debian/control'
15--- debian/control 2016-09-08 22:51:27 +0000
16+++ debian/control 2016-12-07 17:07:44 +0000
17@@ -3,7 +3,7 @@
18 Priority: optional
19 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
20 Build-Depends: cmake,
21- cmake-extras (>= 0.3),
22+ cmake-extras (>= 0.10),
23 debhelper (>= 9),
24 google-mock (>= 1.6.0+svn437),
25 libcgmanager-dev,

Subscribers

People subscribed via source and target branches