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

Proposed by Pete Woods on 2016-12-07
Status: Merged
Merged at revision: 155
Proposed branch: lp:~pete-woods/thumbnailer/cmake-extras-compatibility
Merge into: lp:thumbnailer
Diff against target: 85 lines (+4/-47)
4 files modified
CMakeLists.txt (+2/-3)
cmake/UseGSettings.cmake (+0/-42)
debian/control (+1/-1)
doc/libthumbnailer-qt/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/thumbnailer/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
Michi Henning (community) 2016-12-07 Approve on 2017-02-13
Review via email: mp+312711@code.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Compatibility with unversioned cmake-extras modules

To post a comment you must log in.
Michi Henning (michihenning) wrote :

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

review: Approve
Michi Henning (michihenning) wrote :

Re-approving this after Jenkins problems were fixed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-11-08 22:32:22 +0000
3+++ CMakeLists.txt 2016-12-07 16:59:23 +0000
4@@ -119,9 +119,8 @@
5 include(CTest)
6 enable_testing()
7
8-include(EnableCoverageReport)
9-
10-include(cmake/UseGSettings.cmake)
11+find_package(CoverageReport)
12+find_package(GSettings)
13
14 set(SHARE_PRIV_DIR ${CMAKE_INSTALL_LIBDIR}/thumbnailer)
15 set(SHARE_PRIV_ABS ${CMAKE_INSTALL_FULL_LIBDIR}/thumbnailer)
16
17=== removed directory 'cmake'
18=== removed file 'cmake/UseGSettings.cmake'
19--- cmake/UseGSettings.cmake 2014-09-16 12:12:21 +0000
20+++ cmake/UseGSettings.cmake 1970-01-01 00:00:00 +0000
21@@ -1,42 +0,0 @@
22-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
23-
24-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ${LOCAL_INSTALL})
25-
26-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
27-
28-if(GSETTINGS_LOCALINSTALL)
29- message(STATUS "GSettings schemas will be installed locally.")
30-endif()
31-
32-if(GSETTINGS_COMPILE)
33- message(STATUS "GSettings shemas will be compiled.")
34-endif()
35-
36-macro(add_schema SCHEMA_NAME)
37-
38- set(PKG_CONFIG_EXECUTABLE pkg-config)
39- # Have an option to not install the schema into where GLib is
40- if (GSETTINGS_LOCALINSTALL)
41- SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
42- else (GSETTINGS_LOCALINSTALL)
43- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
44- SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
45- endif (GSETTINGS_LOCALINSTALL)
46-
47- # Run the validator and error if it fails
48- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
49- execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
50-
51- if (_schemas_invalid)
52- message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
53- endif (_schemas_invalid)
54-
55- # Actually install and recomple schemas
56- message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
57- install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
58-
59- if (GSETTINGS_COMPILE)
60- install (CODE "message (STATUS \"Compiling GSettings schemas\")")
61- install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
62- endif ()
63-endmacro()
64
65=== modified file 'debian/control'
66--- debian/control 2016-11-14 01:05:29 +0000
67+++ debian/control 2016-12-07 16:59:23 +0000
68@@ -4,7 +4,7 @@
69 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
70 Standards-Version: 3.9.6
71 Build-Depends: cmake,
72- cmake-extras (>= 0.4),
73+ cmake-extras (>= 0.10),
74 debhelper (>= 9),
75 devscripts,
76 google-mock,
77
78=== modified file 'doc/libthumbnailer-qt/CMakeLists.txt'
79--- doc/libthumbnailer-qt/CMakeLists.txt 2015-12-12 00:05:29 +0000
80+++ doc/libthumbnailer-qt/CMakeLists.txt 2016-12-07 16:59:23 +0000
81@@ -1,4 +1,4 @@
82-include(UseDoxygen OPTIONAL)
83+find_package(DoxygenBuilder)
84
85 file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/unity/thumbnailer/qt/*.h")
86

Subscribers

People subscribed via source and target branches

to all changes: