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

[Pete Woods]

Compatibility with unversioned cmake-extras modules

Compatibility with unversioned cmake-extras modules

[Michi Henning (michihenning)]

Works find for both coverage, doxygen, and gsettings, thanks!

review: Approve

[Michi Henning (michihenning)]

Re-approving this after Jenkins problems were fixed.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-11-08 22:32:22 +0000
+++ CMakeLists.txt	2016-12-07 16:59:23 +0000
@@ -119,9 +119,8 @@
 include(CTest)
 enable_testing()
 
-include(EnableCoverageReport)
-
-include(cmake/UseGSettings.cmake)
+find_package(CoverageReport)
+find_package(GSettings)
 
 set(SHARE_PRIV_DIR ${CMAKE_INSTALL_LIBDIR}/thumbnailer)
 set(SHARE_PRIV_ABS ${CMAKE_INSTALL_FULL_LIBDIR}/thumbnailer)
 
=== removed directory 'cmake'
=== removed file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake	2014-09-16 12:12:21 +0000
+++ cmake/UseGSettings.cmake	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ${LOCAL_INSTALL})
-
-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
-
-if(GSETTINGS_LOCALINSTALL)
-    message(STATUS "GSettings schemas will be installed locally.")
-endif()
-
-if(GSETTINGS_COMPILE)
-    message(STATUS "GSettings shemas will be compiled.")
-endif()
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    # Have an option to not install the schema into where GLib is
-    if (GSETTINGS_LOCALINSTALL)
-        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-    else (GSETTINGS_LOCALINSTALL)
-        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-    endif (GSETTINGS_LOCALINSTALL)
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    if (GSETTINGS_COMPILE)
-        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
-    endif ()
-endmacro()
 
=== modified file 'debian/control'
--- debian/control	2016-11-14 01:05:29 +0000
+++ debian/control	2016-12-07 16:59:23 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.6
 Build-Depends: cmake,
-               cmake-extras (>= 0.4),
+               cmake-extras (>= 0.10),
                debhelper (>= 9),
                devscripts,
                google-mock,
 
=== modified file 'doc/libthumbnailer-qt/CMakeLists.txt'
--- doc/libthumbnailer-qt/CMakeLists.txt	2015-12-12 00:05:29 +0000
+++ doc/libthumbnailer-qt/CMakeLists.txt	2016-12-07 16:59:23 +0000
@@ -1,4 +1,4 @@
-include(UseDoxygen OPTIONAL)
+find_package(DoxygenBuilder)
 
 file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/unity/thumbnailer/qt/*.h")