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

[Pete Woods]

Compatibility with unversioned cmake-extras modules

Compatibility with unversioned cmake-extras modules

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:23
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-display-ci/22/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1246/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1253
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1036/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1036/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1036/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1036/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1036/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1036/console

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

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Looks good.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-21 18:40:11 +0000
+++ CMakeLists.txt	2016-12-07 17:07:32 +0000
@@ -76,7 +76,7 @@
 if(${enable_tests})
   enable_testing()
   if(${enable_coverage})
-    include(EnableCoverageReport)
+    find_package(CoverageReport)
   endif()
 endif()
 
 
=== modified file 'debian/control'
--- debian/control	2016-07-19 07:49:49 +0000
+++ debian/control	2016-12-07 17:07:32 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Charles Kerr <[e-mail]>
 Build-Depends: cmake,
-               cmake-extras (>= 0.4),
+               cmake-extras (>= 0.10),
                dbus,
                libglib2.0-dev (>= 2.36),
                libgudev-1.0-dev,