Transfer Indicator

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

  1. cmake-extras-compatibility
  2. Merge into trunk.16.10
Proposed by Pete Woods
Status: Merged
Approved by: dobey
Approved revision: 54
Merged at revision: 54
Proposed branch: lp:~pete-woods/indicator-transfer/cmake-extras-compatibility
Merge into: lp:indicator-transfer
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/indicator-transfer/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+313021@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 :

PASSED: Continuous integration, rev:54
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1265
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1272
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1055
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1055/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1055
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1055/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1055
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1055/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1055
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1055/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1055
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1055/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1055
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1055/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-transfer-ci/14/rebuild

review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve

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-12-02 21:25:37 +0000
3+++ CMakeLists.txt 2016-12-12 13:54:18 +0000
4@@ -84,7 +84,7 @@
5 pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
6 enable_testing ()
7 add_subdirectory(tests)
8- include(EnableCoverageReport)
9+ find_package(CoverageReport)
10 ENABLE_COVERAGE_REPORT(
11 TARGETS indicator-transfer indicator-transfer-service dmtransfers mock-source-plugin
12 TESTS test-controller test-multisource test-plugin-source test-view-gmenu
13
14=== modified file 'debian/control'
15--- debian/control 2016-11-30 20:01:42 +0000
16+++ debian/control 2016-12-12 13:54:18 +0000
17@@ -3,7 +3,7 @@
18 Priority: optional
19 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
20 Build-Depends: cmake,
21- cmake-extras,
22+ cmake-extras (>= 0.10),
23 dbus,
24 libglib2.0-dev (>= 2.35.4),
25 libproperties-cpp-dev,

Subscribers

People subscribed via source and target branches