Merge lp:~pete-woods/unity-scope-click/cmake-extras-compatibility into lp:unity-scope-click

[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:504
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/129/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1244/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1251
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1034/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1034/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1034/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1034/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1034/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1034/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/129/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Looks good.

review: Approve

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-09 15:02:16 +0000
+++ CMakeLists.txt	2016-12-09 15:02:16 +0000
@@ -19,7 +19,7 @@
 
 find_program(INTLTOOL_MERGE intltool-merge)
 
-include(UseGSettings)
+find_package (GSettings)
 find_package (GMock)
 find_package (PkgConfig REQUIRED)
 
@@ -57,7 +57,7 @@
 add_subdirectory(po)
 add_subdirectory(tools)
 
-include(EnableCoverageReport)
+find_package(CoverageReport)
 ENABLE_COVERAGE_REPORT(TARGETS ${SCOPE_LIB_NAME} ${APPS_LIB_UNVERSIONED}
   TESTS libclick-scope-tests apps-scope-tests init-departments
   FILTER /usr/include ${CMAKE_BINARY_DIR}/*

=== removed directory 'cmake'
=== removed file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake	2014-07-04 13:10:05 +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-10-24 21:28:14 +0000
+++ debian/control	2016-12-09 15:02:16 +0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Build-Depends: cmake (>= 2.8.10),
-               cmake-extras,
+               cmake-extras (>= 0.10),
                dbus-x11,
                debhelper (>= 9),
                dh-python,