Ubuntu Application Launcher

Merge lp:~pete-woods/ubuntu-app-launch/cmake-extras-compatibility into lp:ubuntu-app-launch

  1. cmake-extras-compatibility
  2. Merge into trunk.17.04
Proposed by Pete Woods
Status: Merged
Approved by: Ted Gould
Approved revision: 270
Merged at revision: 271
Proposed branch: lp:~pete-woods/ubuntu-app-launch/cmake-extras-compatibility
Merge into: lp:ubuntu-app-launch
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/ubuntu-app-launch/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+312712@code.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Compatibility with unversioned cmake-extras modules

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:270
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/133/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1243/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1250
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1033/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1033/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1033/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1033/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1033/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1033/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/133/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:270
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/140/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1316
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1323
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1100
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1100/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1100
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1100/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1100
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1100/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1100
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1100/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1100
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1100/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1100
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1100/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/140/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-10 15:39:08 +0000
3+++ CMakeLists.txt 2016-12-07 17:01:36 +0000
4@@ -229,7 +229,7 @@
5 add_subdirectory(tests)
6 endif ()
7
8-include(EnableCoverageReport)
9+find_package(CoverageReport)
10 set(filter-list)
11 list(APPEND filter-list "/usr/include")
12 list(APPEND filter-list "${CMAKE_SOURCE_DIR}/tests/*")
13
14=== modified file 'debian/control'
15--- debian/control 2016-11-10 15:39:08 +0000
16+++ debian/control 2016-12-07 17:01:36 +0000
17@@ -5,7 +5,7 @@
18 Build-Depends: abi-compliance-checker,
19 click-dev (>= 0.2.2),
20 cmake,
21- cmake-extras,
22+ cmake-extras (>= 0.10),
23 dbus-x11,
24 dbus-test-runner,
25 debhelper (>= 9),

Subscribers

People subscribed via source and target branches