Merge lp:~pete-woods/persistent-cache-cpp/cmake-extras-compatibility into lp:persistent-cache-cpp

[Pete Woods]

Compatibility with unversioned cmake-extras modules

Compatibility with unversioned cmake-extras modules

[Michi Henning (michihenning)]

Works fine for coverage and doxygen, thanks!

review: Approve

[Michi Henning (michihenning)]

Not sure why this didn't merge. Top-approving again.

[Michi Henning (michihenning)]

Ah, OK, was targeting trunk, not devel.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-19 07:00:16 +0000
+++ CMakeLists.txt	2016-12-07 17:18:25 +0000
@@ -82,8 +82,7 @@
 include(CTest)
 enable_testing()
 
-include(EnableCoverageReport)
-
+find_package(CoverageReport)
 find_package(Boost COMPONENTS filesystem REQUIRED)
 find_package(Threads REQUIRED)
 
@@ -107,7 +106,7 @@
         ${UNIT_TEST_TARGETS}
 )
 
-include(UseDoxygen OPTIONAL)
+find_package(DoxygenBuilder)
 
 file(GLOB public_headers ${CMAKE_SOURCE_DIR}/include/core/*.h)
 add_doxygen(

=== modified file 'debian/control'
--- debian/control	2015-12-10 05:30:29 +0000
+++ debian/control	2016-12-07 17:18:25 +0000
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               cmake-extras (>= 0.4),
+               cmake-extras (>= 0.10),
                debhelper (>= 9),
                devscripts,
                doxygen,