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

Proposed by Pete Woods on 2016-12-07
Status: Merged
Approved by: Michi Henning on 2016-12-09
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~pete-woods/indicator-display/cmake-extras-compatibility
Merge into: lp:indicator-display
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-display/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
Michi Henning (community) 2016-12-07 Approve on 2016-12-09
unity-api-1-bot continuous-integration Needs Fixing on 2016-12-07
Review via email: mp+312716@code.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Compatibility with unversioned cmake-extras modules

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-03-21 18:40:11 +0000
3+++ CMakeLists.txt 2016-12-07 17:07:32 +0000
4@@ -76,7 +76,7 @@
5 if(${enable_tests})
6 enable_testing()
7 if(${enable_coverage})
8- include(EnableCoverageReport)
9+ find_package(CoverageReport)
10 endif()
11 endif()
12
13
14=== modified file 'debian/control'
15--- debian/control 2016-07-19 07:49:49 +0000
16+++ debian/control 2016-12-07 17:07:32 +0000
17@@ -4,7 +4,7 @@
18 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
19 XSBC-Original-Maintainer: Charles Kerr <charles.kerr@canonical.com>
20 Build-Depends: cmake,
21- cmake-extras (>= 0.4),
22+ cmake-extras (>= 0.10),
23 dbus,
24 libglib2.0-dev (>= 2.36),
25 libgudev-1.0-dev,

Subscribers

People subscribed via source and target branches