Merge lp:~muktupavels/compiz/remove-use-gsettings-option into lp:compiz/0.9.12
- remove-use-gsettings-option
- Merge into 0.9.12
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | 4011 |
Merged at revision: | 4017 |
Proposed branch: | lp:~muktupavels/compiz/remove-use-gsettings-option |
Merge into: | lp:compiz/0.9.12 |
Diff against target: |
508 lines (+123/-178) 14 files modified
cmake/CMakeLists.txt (+4/-5) cmake/CompizGSettings.cmake (+4/-12) cmake/plugin_extensions/CompizGenGSettings.cmake (+17/-20) compizconfig/CMakeLists.txt (+1/-4) compizconfig/integration/gnome/gsettings/CMakeLists.txt (+0/-4) compizconfig/integration/mate/gsettings/CMakeLists.txt (+0/-4) debian/rules (+2/-2) gtk/window-decorator/CMakeLists.txt (+29/-32) gtk/window-decorator/settings.c (+0/-13) gtk/window-decorator/tests/CMakeLists.txt (+52/-56) gtk/window-decorator/tests/test_gwd_settings.cpp (+0/-3) metadata/CMakeLists.txt (+11/-13) postinst/CMakeLists.txt (+2/-6) xslt/CMakeLists.txt (+1/-4) |
To merge this branch: | bzr merge lp:~muktupavels/compiz/remove-use-gsettings-option |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury | Approve | ||
Marco Trevisan (Treviño) | Approve | ||
Review via email:
|
Commit message
CMake: Remove USE_GSETTINGS option.
Description of the change
Remove USE_GSETTINGS option.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Alberts Muktupāvels (muktupavels) wrote : | # |
- GConf has been removed so now there is only two backends - GSettings and Flat-file.
- GSettings is not optional, is it? If you have glib, you have gsettings, no? So disabling it does not remove any dependency.
- Google does not show much results for DUSE_GSETTINGS=OFF. So probably not a popular option... Even if someone want he can still choose to not use GSettings backend.
- gtk-window-
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Sam Spilsbury (smspillaz) wrote : | # |
> - GSettings is not optional, is it? If you have glib, you have gsettings, no?
> So disabling it does not remove any dependency.
This is probably the strongest point. Technically, if I remember correctly, GSettings is part of GIO and not GLib and compiz depends on the latter, not the former, though I can't imagine a situation where you'd have GLib installed but not GIO.
>
> - Google does not show much results for DUSE_GSETTINGS=OFF. So probably not a
> popular option... Even if someone want he can still choose to not use
> GSettings backend.
>
> - gtk-window-
There's also kde4-window-
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Marco Trevisan (Treviño) (3v1n0) wrote : | # |
> This is probably the strongest point. Technically, if I remember correctly,
> GSettings is part of GIO and not GLib and compiz depends on the latter, not
> the former, though I can't imagine a situation where you'd have GLib installed
> but not GIO.
Well, yeah... GSettings is under the gio umbrella, but really I don't think they can be shipped separately, so we can consider them as a whole thing.
So, in general, although I like the idea of making things optional, I don't think this is a case where we really need to be much conservative in allowing compiz without gsettings support.
At the end, every distro around the globe ships GIO in the default install, so choosing a different settings backend (the ini one) could even be just a runtime choice.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Sam Spilsbury (smspillaz) : | # |
Preview Diff
1 | === modified file 'cmake/CMakeLists.txt' |
2 | --- cmake/CMakeLists.txt 2015-12-10 16:34:35 +0000 |
3 | +++ cmake/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
4 | @@ -19,11 +19,10 @@ |
5 | plugin_extensions/CompizGenInstallImages.cmake) |
6 | list (APPEND _PluginExtensionFiles |
7 | plugin_extensions/CompizOpenGLFixups.cmake) |
8 | - |
9 | -if (USE_GSETTINGS) |
10 | - list (APPEND _files CompizGSettings.cmake) |
11 | - list (APPEND _PluginExtensionFiles plugin_extensions/CompizGenGSettings.cmake) |
12 | -endif (USE_GSETTINGS) |
13 | +list (APPEND _files |
14 | + CompizGSettings.cmake) |
15 | +list (APPEND _PluginExtensionFiles |
16 | + plugin_extensions/CompizGenGSettings.cmake) |
17 | |
18 | install ( |
19 | FILES ${_files} |
20 | |
21 | === modified file 'cmake/CompizGSettings.cmake' |
22 | --- cmake/CompizGSettings.cmake 2013-04-28 04:26:33 +0000 |
23 | +++ cmake/CompizGSettings.cmake 2016-05-12 10:19:12 +0000 |
24 | @@ -1,10 +1,4 @@ |
25 | option ( |
26 | - USE_GSETTINGS |
27 | - "Generate GSettings schemas" |
28 | - ON |
29 | -) |
30 | - |
31 | -option ( |
32 | COMPIZ_DISABLE_GS_SCHEMAS_INSTALL |
33 | "Disables gsettings schema installation" |
34 | OFF |
35 | @@ -74,8 +68,7 @@ |
36 | |
37 | if (PKG_CONFIG_TOOL AND |
38 | GLIB_COMPILE_SCHEMAS AND NOT |
39 | - COMPIZ_DISABLE_SCHEMAS_INSTALL AND |
40 | - USE_GSETTINGS) |
41 | + COMPIZ_DISABLE_SCHEMAS_INSTALL) |
42 | |
43 | # Install schema file |
44 | install (CODE " |
45 | @@ -111,8 +104,7 @@ |
46 | |
47 | endif (PKG_CONFIG_TOOL AND |
48 | GLIB_COMPILE_SCHEMAS AND NOT |
49 | - COMPIZ_DISABLE_SCHEMAS_INSTALL AND |
50 | - USE_GSETTINGS) |
51 | + COMPIZ_DISABLE_SCHEMAS_INSTALL) |
52 | endfunction () |
53 | |
54 | function (add_gsettings_local_recompilation_rule _schemas) |
55 | @@ -195,13 +187,13 @@ |
56 | |
57 | endfunction () |
58 | |
59 | -# generate gconf schema |
60 | +# generate gsettings schema |
61 | function (compiz_gsettings_schema _name _src _dst _inst) |
62 | find_program (XSLTPROC_EXECUTABLE xsltproc) |
63 | find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas) |
64 | mark_as_advanced (FORCE XSLTPROC_EXECUTABLE) |
65 | |
66 | - if (XSLTPROC_EXECUTABLE AND GLIB_COMPILE_SCHEMAS AND USE_GSETTINGS) |
67 | + if (XSLTPROC_EXECUTABLE AND GLIB_COMPILE_SCHEMAS) |
68 | add_custom_command ( |
69 | OUTPUT ${_dst} |
70 | COMMAND ${XSLTPROC_EXECUTABLE} |
71 | |
72 | === modified file 'cmake/plugin_extensions/CompizGenGSettings.cmake' |
73 | --- cmake/plugin_extensions/CompizGenGSettings.cmake 2013-02-20 13:55:12 +0000 |
74 | +++ cmake/plugin_extensions/CompizGenGSettings.cmake 2016-05-12 10:19:12 +0000 |
75 | @@ -29,23 +29,20 @@ |
76 | endif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package") |
77 | endmacro (compiz_gsettings_prepare_install_dirs) |
78 | |
79 | -if (USE_GSETTINGS) |
80 | - |
81 | - compiz_gsettings_prepare_install_dirs () |
82 | - |
83 | - set (PLUGIN_GSETTINGS_SCHEMA_DST |
84 | - ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml) |
85 | - |
86 | - set (_install_gsettings_schema ) |
87 | - if (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN}) |
88 | - set (_install_gsettings_schema NOINSTALL) |
89 | - endif (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN}) |
90 | - |
91 | - compiz_gsettings_schema (${COMPIZ_CURRENT_PLUGIN} |
92 | - ${COMPIZ_CURRENT_XML_FILE} |
93 | - ${PLUGIN_GSETTINGS_SCHEMA_DST} |
94 | - ${PLUGIN_SCHEMADIR} |
95 | - ${_install_gsettings_schema}) |
96 | - list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${PLUGIN_GSETTINGS_SCHEMA_DST}) |
97 | - |
98 | -endif (USE_GSETTINGS) |
99 | +compiz_gsettings_prepare_install_dirs () |
100 | + |
101 | +set (PLUGIN_GSETTINGS_SCHEMA_DST |
102 | + ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml) |
103 | + |
104 | +set (_install_gsettings_schema ) |
105 | +if (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN}) |
106 | + set (_install_gsettings_schema NOINSTALL) |
107 | +endif (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN}) |
108 | + |
109 | +compiz_gsettings_schema (${COMPIZ_CURRENT_PLUGIN} |
110 | + ${COMPIZ_CURRENT_XML_FILE} |
111 | + ${PLUGIN_GSETTINGS_SCHEMA_DST} |
112 | + ${PLUGIN_SCHEMADIR} |
113 | + ${_install_gsettings_schema}) |
114 | + |
115 | +list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${PLUGIN_GSETTINGS_SCHEMA_DST}) |
116 | |
117 | === modified file 'compizconfig/CMakeLists.txt' |
118 | --- compizconfig/CMakeLists.txt 2015-12-10 16:34:35 +0000 |
119 | +++ compizconfig/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
120 | @@ -20,10 +20,7 @@ |
121 | add_subdirectory (compizconfig-python) |
122 | add_subdirectory (integration) |
123 | add_subdirectory (ccsm) |
124 | - |
125 | -if (USE_GSETTINGS) |
126 | - add_subdirectory (gsettings) |
127 | -endif (USE_GSETTINGS) |
128 | +add_subdirectory (gsettings) |
129 | |
130 | if (COMPIZ_BUILD_TESTING) |
131 | add_subdirectory (mocks) |
132 | |
133 | === modified file 'compizconfig/integration/gnome/gsettings/CMakeLists.txt' |
134 | --- compizconfig/integration/gnome/gsettings/CMakeLists.txt 2015-12-10 16:34:35 +0000 |
135 | +++ compizconfig/integration/gnome/gsettings/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
136 | @@ -1,7 +1,5 @@ |
137 | include (FindPkgConfig) |
138 | |
139 | -if (USE_GSETTINGS) |
140 | - |
141 | set (_deps |
142 | glib-2.0>=2.20.0 |
143 | gio-2.0>=2.25.0) |
144 | @@ -83,5 +81,3 @@ |
145 | endif (COMPIZ_BUILD_TESTING) |
146 | |
147 | endif (COMPIZCONFIG_GNOME_GSETTINGS_INTEGRATION_FOUND) |
148 | - |
149 | -endif (USE_GSETTINGS) |
150 | |
151 | === modified file 'compizconfig/integration/mate/gsettings/CMakeLists.txt' |
152 | --- compizconfig/integration/mate/gsettings/CMakeLists.txt 2015-12-10 16:34:35 +0000 |
153 | +++ compizconfig/integration/mate/gsettings/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
154 | @@ -1,7 +1,5 @@ |
155 | include (FindPkgConfig) |
156 | |
157 | -if (USE_GSETTINGS) |
158 | - |
159 | set (_deps |
160 | glib-2.0>=2.20.0 |
161 | gio-2.0>=2.25.0) |
162 | @@ -56,5 +54,3 @@ |
163 | endif (COMPIZ_BUILD_TESTING) |
164 | |
165 | endif (COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_FOUND) |
166 | - |
167 | -endif (USE_GSETTINGS) |
168 | |
169 | === modified file 'debian/rules' |
170 | --- debian/rules 2015-12-10 16:34:35 +0000 |
171 | +++ debian/rules 2016-05-12 10:19:12 +0000 |
172 | @@ -20,9 +20,9 @@ |
173 | override_dh_auto_configure: |
174 | # right now, xorg-gtest won't compile on arm. |
175 | ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures))) |
176 | - dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF |
177 | + dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF -DBUILD_GLES=ON -DBUILD_XORG_GTEST=OFF |
178 | else |
179 | - dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DUSE_GSETTINGS=ON -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF |
180 | + dh_auto_configure -- -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DCOMPIZ_DISABLE_PLUGIN_KDE=ON -DCOMPIZ_BUILD_TESTING=OFF -DUSE_KDE4=OFF |
181 | endif |
182 | |
183 | override_dh_install: |
184 | |
185 | === modified file 'gtk/window-decorator/CMakeLists.txt' |
186 | --- gtk/window-decorator/CMakeLists.txt 2016-02-29 15:32:42 +0000 |
187 | +++ gtk/window-decorator/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
188 | @@ -53,38 +53,35 @@ |
189 | gtk_window_decorator_metacity_window_decoration_util |
190 | gtk_window_decorator_cairo_window_decoration_util) |
191 | |
192 | - if (USE_GSETTINGS) |
193 | - add_definitions (-DUSE_GSETTINGS) |
194 | - add_library (gtk_window_decorator_settings_storage_gsettings STATIC |
195 | - ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c) |
196 | - |
197 | - compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0) |
198 | - |
199 | - target_link_libraries (gtk_window_decorator_settings_storage_gsettings |
200 | - ${GSETTINGS_LIBRARIES}) |
201 | - |
202 | - list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES |
203 | - gtk_window_decorator_settings_storage_gsettings) |
204 | - |
205 | - set (_gwd_gschema_name org.compiz.gwd) |
206 | - set (_gwd_gschema_filename ${_gwd_gschema_name}.gschema.xml) |
207 | - set (_gwd_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_gwd_gschema_filename}) |
208 | - set (_gwd_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_gwd_gschema_filename}) |
209 | - set (_gwd_gschema_dest ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/) |
210 | - |
211 | - add_custom_command (OUTPUT ${_gwd_gschema_generated_location} |
212 | - COMMAND cp -r ${_gwd_gschema_filepath} ${_gwd_gschema_generated_location} |
213 | - DEPENDS ${_gwd_gschema_filepath} |
214 | - VERBATIM) |
215 | - |
216 | - add_custom_target (compiz_gwd_gsettings_org_compiz_gwd_schema ALL |
217 | - DEPENDS ${_gwd_gschema_generated_location}) |
218 | - |
219 | - add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_compiz_gwd_schema) |
220 | - |
221 | - compiz_install_gsettings_schema (${_gwd_gschema_generated_location} |
222 | - ${_gwd_gschema_dest}) |
223 | - endif (USE_GSETTINGS) |
224 | + add_library (gtk_window_decorator_settings_storage_gsettings STATIC |
225 | + ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c) |
226 | + |
227 | + compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0) |
228 | + |
229 | + target_link_libraries (gtk_window_decorator_settings_storage_gsettings |
230 | + ${GSETTINGS_LIBRARIES}) |
231 | + |
232 | + list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES |
233 | + gtk_window_decorator_settings_storage_gsettings) |
234 | + |
235 | + set (_gwd_gschema_name org.compiz.gwd) |
236 | + set (_gwd_gschema_filename ${_gwd_gschema_name}.gschema.xml) |
237 | + set (_gwd_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_gwd_gschema_filename}) |
238 | + set (_gwd_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_gwd_gschema_filename}) |
239 | + set (_gwd_gschema_dest ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/) |
240 | + |
241 | + add_custom_command (OUTPUT ${_gwd_gschema_generated_location} |
242 | + COMMAND cp -r ${_gwd_gschema_filepath} ${_gwd_gschema_generated_location} |
243 | + DEPENDS ${_gwd_gschema_filepath} |
244 | + VERBATIM) |
245 | + |
246 | + add_custom_target (compiz_gwd_gsettings_org_compiz_gwd_schema ALL |
247 | + DEPENDS ${_gwd_gschema_generated_location}) |
248 | + |
249 | + add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_compiz_gwd_schema) |
250 | + |
251 | + compiz_install_gsettings_schema (${_gwd_gschema_generated_location} |
252 | + ${_gwd_gschema_dest}) |
253 | |
254 | add_executable (gtk-window-decorator |
255 | gtk-window-decorator.c |
256 | |
257 | === modified file 'gtk/window-decorator/settings.c' |
258 | --- gtk/window-decorator/settings.c 2016-03-15 12:58:29 +0000 |
259 | +++ gtk/window-decorator/settings.c 2016-05-12 10:19:12 +0000 |
260 | @@ -22,11 +22,7 @@ |
261 | #include "gtk-window-decorator.h" |
262 | #include "gwd-settings-writable-interface.h" |
263 | #include "gwd-settings-storage-interface.h" |
264 | - |
265 | -#ifdef USE_GSETTINGS |
266 | #include "gwd-settings-storage-gsettings.h" |
267 | -#endif |
268 | - |
269 | #include "gwd-settings-xproperty-storage.h" |
270 | |
271 | GWDSettingsStorage *storage = NULL; |
272 | @@ -36,8 +32,6 @@ |
273 | init_settings (GWDSettingsWritable *writable, |
274 | WnckScreen *screen) |
275 | { |
276 | -#ifdef USE_GSETTINGS |
277 | -#define STORAGE_USED |
278 | GSettings *compiz = gwd_get_org_compiz_gwd_settings (); |
279 | GSettings *metacity = gwd_get_org_gnome_metacity_settings (); |
280 | GSettings *gnome = gwd_get_org_gnome_desktop_wm_preferences_settings (); |
281 | @@ -49,11 +43,9 @@ |
282 | gwd_connect_org_gnome_metacity_settings (metacity, storage); |
283 | gwd_connect_org_gnome_desktop_wm_preferences_settings (gnome, storage); |
284 | gwd_connect_org_mate_marco_general_settings (marco, storage); |
285 | -#endif |
286 | |
287 | xprop_storage = gwd_settings_xproperty_storage_new (writable); |
288 | |
289 | -#ifdef STORAGE_USED |
290 | gwd_settings_storage_update_metacity_theme (storage); |
291 | gwd_settings_storage_update_opacity (storage); |
292 | gwd_settings_storage_update_button_layout (storage); |
293 | @@ -62,11 +54,6 @@ |
294 | gwd_settings_storage_update_blur (storage); |
295 | gwd_settings_storage_update_use_tooltips (storage); |
296 | gwd_process_decor_shadow_property_update (); |
297 | -#else |
298 | - storage = NULL; |
299 | -#endif |
300 | - |
301 | -#undef STORAGE_USED |
302 | |
303 | return TRUE; |
304 | } |
305 | |
306 | === modified file 'gtk/window-decorator/tests/CMakeLists.txt' |
307 | --- gtk/window-decorator/tests/CMakeLists.txt 2016-03-18 18:56:12 +0000 |
308 | +++ gtk/window-decorator/tests/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
309 | @@ -58,62 +58,58 @@ |
310 | gtk_window_decorator_settings_storage_interface |
311 | gtk_window_decorator_settings_notified_interface) |
312 | |
313 | - if (USE_GSETTINGS) |
314 | - add_definitions (-DUSE_GSETTINGS) |
315 | - set (_desktop_gschema_name org.gnome.desktop.wm.preferences) |
316 | - set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml) |
317 | - set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename}) |
318 | - set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename}) |
319 | - |
320 | - add_custom_command (OUTPUT ${_desktop_gschema_generated_location} |
321 | - COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location} |
322 | - DEPENDS ${_desktop_gschema_filepath} |
323 | - VERBATIM) |
324 | - |
325 | - add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL |
326 | - DEPENDS ${_desktop_gschema_generated_location}) |
327 | - |
328 | - add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema) |
329 | - |
330 | - set (_metacity_gschema_name org.gnome.metacity) |
331 | - set (_metacity_gschema_filename ${_metacity_gschema_name}.gschema.xml) |
332 | - set (_metacity_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_metacity_gschema_filename}) |
333 | - set (_metacity_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_metacity_gschema_filename}) |
334 | - |
335 | - add_custom_command (OUTPUT ${_metacity_gschema_generated_location} |
336 | - COMMAND cp -r ${_metacity_gschema_filepath} ${_metacity_gschema_generated_location} |
337 | - DEPENDS ${_metacity_gschema_filepath} |
338 | - VERBATIM) |
339 | - |
340 | - add_custom_target (compiz_gwd_gsettings_org_gnome_metacity_schema ALL |
341 | - DEPENDS ${_metacity_gschema_generated_location}) |
342 | - |
343 | - add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_metacity_schema) |
344 | - |
345 | - set (_marco_gschema_name org.mate.marco) |
346 | - set (_marco_gschema_filename ${_marco_gschema_name}.gschema.xml) |
347 | - set (_marco_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_marco_gschema_filename}) |
348 | - set (_marco_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_marco_gschema_filename}) |
349 | - |
350 | - add_custom_command (OUTPUT ${_marco_gschema_generated_location} |
351 | - COMMAND cp -r ${_marco_gschema_filepath} ${_marco_gschema_generated_location} |
352 | - DEPENDS ${_marco_gschema_filepath} |
353 | - VERBATIM) |
354 | - |
355 | - add_custom_target (compiz_gwd_gsettings_org_mate_marco_schema ALL |
356 | - DEPENDS ${_marco_gschema_generated_location}) |
357 | - |
358 | - add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_mate_marco_schema) |
359 | - |
360 | - set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES |
361 | - ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES} |
362 | - gtk_window_decorator_settings_storage_gsettings) |
363 | - |
364 | - set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS |
365 | - ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS} |
366 | - gtk_window_decorator_settings_storage_gsettings) |
367 | - endif (USE_GSETTINGS) |
368 | - |
369 | + set (_desktop_gschema_name org.gnome.desktop.wm.preferences) |
370 | + set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml) |
371 | + set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename}) |
372 | + set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename}) |
373 | + |
374 | + add_custom_command (OUTPUT ${_desktop_gschema_generated_location} |
375 | + COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location} |
376 | + DEPENDS ${_desktop_gschema_filepath} |
377 | + VERBATIM) |
378 | + |
379 | + add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL |
380 | + DEPENDS ${_desktop_gschema_generated_location}) |
381 | + |
382 | + add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema) |
383 | + |
384 | + set (_metacity_gschema_name org.gnome.metacity) |
385 | + set (_metacity_gschema_filename ${_metacity_gschema_name}.gschema.xml) |
386 | + set (_metacity_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_metacity_gschema_filename}) |
387 | + set (_metacity_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_metacity_gschema_filename}) |
388 | + |
389 | + add_custom_command (OUTPUT ${_metacity_gschema_generated_location} |
390 | + COMMAND cp -r ${_metacity_gschema_filepath} ${_metacity_gschema_generated_location} |
391 | + DEPENDS ${_metacity_gschema_filepath} |
392 | + VERBATIM) |
393 | + |
394 | + add_custom_target (compiz_gwd_gsettings_org_gnome_metacity_schema ALL |
395 | + DEPENDS ${_metacity_gschema_generated_location}) |
396 | + |
397 | + add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_metacity_schema) |
398 | + |
399 | + set (_marco_gschema_name org.mate.marco) |
400 | + set (_marco_gschema_filename ${_marco_gschema_name}.gschema.xml) |
401 | + set (_marco_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_marco_gschema_filename}) |
402 | + set (_marco_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_marco_gschema_filename}) |
403 | + |
404 | + add_custom_command (OUTPUT ${_marco_gschema_generated_location} |
405 | + COMMAND cp -r ${_marco_gschema_filepath} ${_marco_gschema_generated_location} |
406 | + DEPENDS ${_marco_gschema_filepath} |
407 | + VERBATIM) |
408 | + |
409 | + add_custom_target (compiz_gwd_gsettings_org_mate_marco_schema ALL |
410 | + DEPENDS ${_marco_gschema_generated_location}) |
411 | + |
412 | + add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_mate_marco_schema) |
413 | + |
414 | + set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES |
415 | + ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES} |
416 | + gtk_window_decorator_settings_storage_gsettings) |
417 | + |
418 | + set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS |
419 | + ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS} |
420 | + gtk_window_decorator_settings_storage_gsettings) |
421 | |
422 | target_link_libraries (compiz_test_gwd_settings |
423 | ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES} |
424 | |
425 | === modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp' |
426 | --- gtk/window-decorator/tests/test_gwd_settings.cpp 2016-03-18 18:36:50 +0000 |
427 | +++ gtk/window-decorator/tests/test_gwd_settings.cpp 2016-05-12 10:19:12 +0000 |
428 | @@ -1414,7 +1414,6 @@ |
429 | INSTANTIATE_TEST_CASE_P (MockStorageUpdates, GWDSettingsTestStorageUpdates, |
430 | ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDMockSettingsStorageFactoryWrapper ()))); |
431 | |
432 | -#ifdef USE_GSETTINGS |
433 | class GWDSettingsStorageGSettingsTest : |
434 | public GWDSettingsTestCommon |
435 | { |
436 | @@ -1579,5 +1578,3 @@ |
437 | |
438 | INSTANTIATE_TEST_CASE_P (GSettingsStorageUpdates, GWDSettingsTestStorageUpdates, |
439 | ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDSettingsStorageGSettingsFactoryWrapper ()))); |
440 | - |
441 | -#endif |
442 | |
443 | === modified file 'metadata/CMakeLists.txt' |
444 | --- metadata/CMakeLists.txt 2015-12-10 16:34:35 +0000 |
445 | +++ metadata/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
446 | @@ -40,16 +40,14 @@ |
447 | DEPENDS ${_core_xml_file} |
448 | ) |
449 | |
450 | -if (USE_GSETTINGS) |
451 | - set (_core_gschema_path ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.core.gschema.xml) |
452 | - compiz_gsettings_schema ( |
453 | - compiz |
454 | - ${_core_xml_file} |
455 | - ${_core_gschema_path} |
456 | - ${datadir}/glib-2.0/schemas |
457 | - ) |
458 | - add_custom_target (core-settings-schema ALL |
459 | - DEPENDS ${_core_gschema_path} |
460 | - core-xml-file |
461 | - ) |
462 | -endif () |
463 | +set (_core_gschema_path ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.core.gschema.xml) |
464 | +compiz_gsettings_schema ( |
465 | + compiz |
466 | + ${_core_xml_file} |
467 | + ${_core_gschema_path} |
468 | + ${datadir}/glib-2.0/schemas |
469 | +) |
470 | +add_custom_target (core-settings-schema ALL |
471 | + DEPENDS ${_core_gschema_path} |
472 | + core-xml-file |
473 | +) |
474 | |
475 | === modified file 'postinst/CMakeLists.txt' |
476 | --- postinst/CMakeLists.txt 2012-09-10 07:49:26 +0000 |
477 | +++ postinst/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
478 | @@ -6,9 +6,5 @@ |
479 | PROPERTY GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE |
480 | FALSE) |
481 | |
482 | -if (USE_GSETTINGS) |
483 | - |
484 | - compiz_add_install_recompile_gsettings_schemas (${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas) |
485 | - add_all_gsettings_schemas_to_local_recompilation_rule () |
486 | - |
487 | -endif (USE_GSETTINGS) |
488 | +compiz_add_install_recompile_gsettings_schemas (${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas) |
489 | +add_all_gsettings_schemas_to_local_recompilation_rule () |
490 | |
491 | === modified file 'xslt/CMakeLists.txt' |
492 | --- xslt/CMakeLists.txt 2015-12-10 16:34:35 +0000 |
493 | +++ xslt/CMakeLists.txt 2016-05-12 10:19:12 +0000 |
494 | @@ -1,13 +1,10 @@ |
495 | - |
496 | set (_files |
497 | bcop.xslt |
498 | ) |
499 | |
500 | compiz_configure_file (compiz_gsettings_schemas.xslt.in compiz_gsettings_schemas.xslt) |
501 | |
502 | -if (USE_GSETTINGS) |
503 | - list (APPEND _files ${CMAKE_CURRENT_BINARY_DIR}/compiz_gsettings_schemas.xslt) |
504 | -endif () |
505 | +list (APPEND _files ${CMAKE_CURRENT_BINARY_DIR}/compiz_gsettings_schemas.xslt) |
506 | |
507 | install ( |
508 | FILES ${_files} |
Hmm. Technically compiz isn't really supposed to have a hard-dependency on any DE's libraries. A lot of this stuff has been optional for historical reasons and its generally a good practice to avoid getting too tied to one thing.
Is there any reason why you wanted to remove the option? I suspect the better approach is just to enable it by default.