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

[Pete Woods]

Compatibility with unversioned cmake-extras modules

Compatibility with unversioned cmake-extras modules

[Michi Henning (michihenning)]

Looks good.

review: Approve

[Pete Woods (pete-woods)]

Seems like someone already fixed this.

[Charles Kerr (charlesk)]

:D

Unmerged revisions

93. By Pete Woods on 2016-12-07

Compatibility with unversioned cmake-extras modules

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-26 09:30:11 +0000
+++ CMakeLists.txt	2016-12-07 17:18:36 +0000
@@ -272,7 +272,7 @@
 include(CTest)
 enable_testing()
 
-include(EnableCoverageReport)
+find_package(CoverageReport)
 
 add_subdirectory(data)
 add_subdirectory(src)

=== modified file 'debian/control'
--- debian/control	2016-08-26 08:48:05 +0000
+++ debian/control	2016-12-07 17:18:36 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Unity API Team <[e-mail]>
 Build-Depends: cmake,
-               cmake-extras,
+               cmake-extras (>= 0.10),
                dbus,
                debhelper (>= 9), 
 # for building the code:

=== modified file 'src/client/qml-plugin/CMakeLists.txt'
--- src/client/qml-plugin/CMakeLists.txt	2016-08-26 09:30:11 +0000
+++ src/client/qml-plugin/CMakeLists.txt	2016-12-07 17:18:36 +0000
@@ -6,8 +6,7 @@
 add_definitions(-DKEEPER_MAJOR=${KEEPER_MAJOR})
 add_definitions(-DKEEPER_MINOR=${KEEPER_MINOR})
 
-include(QmlPlugins)
-
+find_package(QmlPlugins)
 find_package(Qt5Quick REQUIRED)
 
 include_directories(