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

[Pete Woods]

Compatibility with unversioned cmake-extras modules

Compatibility with unversioned cmake-extras modules

[Michi Henning (michihenning)]

Works fine, thanks!

review: Approve

[Michi Henning (michihenning)]

Rejecting this simply because we had problems with the silo. We've since merged the fix, so all is well.

review: Disapprove

Unmerged revisions

15. By Pete Woods on 2016-12-07

Compatibility with unversioned cmake-extras modules

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-31 09:03:32 +0000
+++ CMakeLists.txt	2016-12-07 17:29:17 +0000
@@ -104,7 +104,7 @@
 include(CTest)
 enable_testing()
 
-include(EnableCoverageReport)
+find_package(CoverageReport)
 
 include(GNUInstallDirs)
 

=== modified file 'debian/control.in'
--- debian/control.in	2016-09-30 01:47:57 +0000
+++ debian/control.in	2016-12-07 17:29:17 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Standards-Version: 3.9.6
 Build-Depends: cmake,
-               cmake-extras (>= 0.4),
+               cmake-extras (>= 0.10),
                debhelper (>= 9),
                devscripts,
                doxygen,