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

[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:19
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1241/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1248
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1031/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1031/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1031/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1031/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1031/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1031/console

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

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Looks good.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-29 19:14:32 +0000
+++ CMakeLists.txt	2016-12-07 17:06:22 +0000
@@ -34,7 +34,7 @@
 ##
 
 set_property(GLOBAL PROPERTY FORMAT_SOURCES)
-include(FormatCode)
+find_package(FormatCode)
 
 ##
 ## Go deeper into the tree
@@ -60,7 +60,7 @@
 ## Coverage
 ##
 
-include(EnableCoverageReport)
+find_package(CoverageReport)
 set(filter-list)
 list(APPEND filter-list "/usr")
 list(APPEND filter-list "${CMAKE_SOURCE_DIR}/tests")
 
=== modified file 'debian/control'
--- debian/control	2016-08-25 19:00:19 +0000
+++ debian/control	2016-12-07 17:06:22 +0000
@@ -7,7 +7,7 @@
                clang-format | clang-format-3.4,
                click-dev,
                cmake,
-               cmake-extras,
+               cmake-extras (>= 0.10),
                dbus,
                dbus-test-runner,
                debhelper (>= 9),