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

[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:340
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1247/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1254
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1037/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1037/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1037/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1037/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1037/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1037/console

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

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Works fine, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-31 03:30:14 +0000
+++ CMakeLists.txt	2016-12-07 17:15:27 +0000
@@ -43,7 +43,7 @@
 # C does not have any more warning flags.
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++")
 endif()
-include(EnableCoverageReport)
+find_package(CoverageReport)
 
 include(GNUInstallDirs)
 set(LIBDIR $CMAKE_INSTALL_LIBDIR)

=== modified file 'debian/control.in'
--- debian/control.in	2016-02-12 07:37:56 +0000
+++ debian/control.in	2016-12-07 17:15:27 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.6
 Build-Depends: cmake,
-               cmake-extras,
+               cmake-extras (>= 0.10),
                dbus,
                debhelper (>= 9),
                libapparmor-dev,