Merge lp:~muktupavels/compiz/remove-use-gsettings-option into lp:compiz/0.9.12

[Alberts Muktupāvels]

CMake: Remove USE_GSETTINGS option.

Remove USE_GSETTINGS option.

[Sam Spilsbury (smspillaz)]

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.

review: Needs Information

[Alberts Muktupāvels (muktupavels)]

- 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-decorator does not use any other settings backend.

[Sam Spilsbury (smspillaz)]

> - 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-decorator does not use any other settings backend.

There's also kde4-window-decorator ;-)

[Marco Trevisan (Treviño) (3v1n0)]

> 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.

review: Approve

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'cmake/CMakeLists.txt'
--- cmake/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ cmake/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -19,11 +19,10 @@
       plugin_extensions/CompizGenInstallImages.cmake)
 list (APPEND _PluginExtensionFiles
       plugin_extensions/CompizOpenGLFixups.cmake)
-
-if (USE_GSETTINGS)
-    list (APPEND _files CompizGSettings.cmake)
-    list (APPEND _PluginExtensionFiles plugin_extensions/CompizGenGSettings.cmake)
-endif (USE_GSETTINGS)
+list (APPEND _files
+      CompizGSettings.cmake)
+list (APPEND _PluginExtensionFiles
+      plugin_extensions/CompizGenGSettings.cmake)
 
 install (
     FILES ${_files}

=== modified file 'cmake/CompizGSettings.cmake'
--- cmake/CompizGSettings.cmake	2013-04-28 04:26:33 +0000
+++ cmake/CompizGSettings.cmake	2016-05-12 10:19:12 +0000
@@ -1,10 +1,4 @@
 option (
-    USE_GSETTINGS
-    "Generate GSettings schemas"
-    ON
-)
-
-option (
     COMPIZ_DISABLE_GS_SCHEMAS_INSTALL
     "Disables gsettings schema installation"
     OFF
@@ -74,8 +68,7 @@
 
     if (PKG_CONFIG_TOOL AND
 	GLIB_COMPILE_SCHEMAS AND NOT
-	COMPIZ_DISABLE_SCHEMAS_INSTALL AND
-	USE_GSETTINGS)
+	COMPIZ_DISABLE_SCHEMAS_INSTALL)
 
 	# Install schema file
 	install (CODE "
@@ -111,8 +104,7 @@
 
     endif (PKG_CONFIG_TOOL AND
 	   GLIB_COMPILE_SCHEMAS AND NOT
-	   COMPIZ_DISABLE_SCHEMAS_INSTALL AND
-	   USE_GSETTINGS)
+	   COMPIZ_DISABLE_SCHEMAS_INSTALL)
 endfunction ()
 
 function (add_gsettings_local_recompilation_rule _schemas)
@@ -195,13 +187,13 @@
 
 endfunction ()
 
-# generate gconf schema
+# generate gsettings schema
 function (compiz_gsettings_schema _name _src _dst _inst)
     find_program (XSLTPROC_EXECUTABLE xsltproc)
     find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
     mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
 
-    if (XSLTPROC_EXECUTABLE AND GLIB_COMPILE_SCHEMAS AND USE_GSETTINGS)
+    if (XSLTPROC_EXECUTABLE AND GLIB_COMPILE_SCHEMAS)
 	add_custom_command (
 	    OUTPUT ${_dst}
 	    COMMAND ${XSLTPROC_EXECUTABLE}

=== modified file 'cmake/plugin_extensions/CompizGenGSettings.cmake'
--- cmake/plugin_extensions/CompizGenGSettings.cmake	2013-02-20 13:55:12 +0000
+++ cmake/plugin_extensions/CompizGenGSettings.cmake	2016-05-12 10:19:12 +0000
@@ -29,23 +29,20 @@
     endif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
 endmacro (compiz_gsettings_prepare_install_dirs)
 
-if (USE_GSETTINGS)
-
-    compiz_gsettings_prepare_install_dirs ()
-
-    set (PLUGIN_GSETTINGS_SCHEMA_DST
-	 ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml)
-
-    set (_install_gsettings_schema )
-    if (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN})
-	set (_install_gsettings_schema NOINSTALL)
-    endif (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN})
-
-    compiz_gsettings_schema (${COMPIZ_CURRENT_PLUGIN}
-			     ${COMPIZ_CURRENT_XML_FILE}
-			     ${PLUGIN_GSETTINGS_SCHEMA_DST}
-			     ${PLUGIN_SCHEMADIR}
-			     ${_install_gsettings_schema})
-    list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${PLUGIN_GSETTINGS_SCHEMA_DST})
-
-endif (USE_GSETTINGS)
+compiz_gsettings_prepare_install_dirs ()
+
+set (PLUGIN_GSETTINGS_SCHEMA_DST
+     ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml)
+
+set (_install_gsettings_schema )
+if (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN})
+    set (_install_gsettings_schema NOINSTALL)
+endif (NOT _install_plugin_${COMPIZ_CURRENT_PLUGIN})
+
+compiz_gsettings_schema (${COMPIZ_CURRENT_PLUGIN}
+	                       ${COMPIZ_CURRENT_XML_FILE}
+	                       ${PLUGIN_GSETTINGS_SCHEMA_DST}
+	                       ${PLUGIN_SCHEMADIR}
+	                       ${_install_gsettings_schema})
+
+list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${PLUGIN_GSETTINGS_SCHEMA_DST})

=== modified file 'compizconfig/CMakeLists.txt'
--- compizconfig/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ compizconfig/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -20,10 +20,7 @@
 add_subdirectory (compizconfig-python)
 add_subdirectory (integration)
 add_subdirectory (ccsm)
-
-if (USE_GSETTINGS)
-    add_subdirectory (gsettings)
-endif (USE_GSETTINGS)
+add_subdirectory (gsettings)
 
 if (COMPIZ_BUILD_TESTING)
     add_subdirectory (mocks)

=== modified file 'compizconfig/integration/gnome/gsettings/CMakeLists.txt'
--- compizconfig/integration/gnome/gsettings/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ compizconfig/integration/gnome/gsettings/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -1,7 +1,5 @@
 include (FindPkgConfig)
 
-if (USE_GSETTINGS)
-
     set (_deps
 	glib-2.0>=2.20.0
 	gio-2.0>=2.25.0)
@@ -83,5 +81,3 @@
 	endif (COMPIZ_BUILD_TESTING)
 
     endif (COMPIZCONFIG_GNOME_GSETTINGS_INTEGRATION_FOUND)
-
-endif (USE_GSETTINGS)

=== modified file 'compizconfig/integration/mate/gsettings/CMakeLists.txt'
--- compizconfig/integration/mate/gsettings/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ compizconfig/integration/mate/gsettings/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -1,7 +1,5 @@
 include (FindPkgConfig)
 
-if (USE_GSETTINGS)
-
     set (_deps
 	glib-2.0>=2.20.0
 	gio-2.0>=2.25.0)
@@ -56,5 +54,3 @@
 	endif (COMPIZ_BUILD_TESTING)
 
     endif (COMPIZCONFIG_MATE_GSETTINGS_INTEGRATION_FOUND)
-
-endif (USE_GSETTINGS)

=== modified file 'debian/rules'
--- debian/rules	2015-12-10 16:34:35 +0000
+++ debian/rules	2016-05-12 10:19:12 +0000
@@ -20,9 +20,9 @@
 override_dh_auto_configure:
         # right now, xorg-gtest won't compile on arm.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	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
+	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
 else
-	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
+	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
 endif
 
 override_dh_install:

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2016-02-29 15:32:42 +0000
+++ gtk/window-decorator/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -53,38 +53,35 @@
 	 gtk_window_decorator_metacity_window_decoration_util
 	 gtk_window_decorator_cairo_window_decoration_util)
 
-    if (USE_GSETTINGS)
-	add_definitions (-DUSE_GSETTINGS)
-	add_library (gtk_window_decorator_settings_storage_gsettings STATIC
-		     ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c)
-
-	compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0)
-
-	target_link_libraries (gtk_window_decorator_settings_storage_gsettings
-			       ${GSETTINGS_LIBRARIES})
-
-	list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
-	      gtk_window_decorator_settings_storage_gsettings)
-
-	set (_gwd_gschema_name org.compiz.gwd)
-	set (_gwd_gschema_filename ${_gwd_gschema_name}.gschema.xml)
-	set (_gwd_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_gwd_gschema_filename})
-	set (_gwd_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_gwd_gschema_filename})
-	set (_gwd_gschema_dest ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/)
-
-	add_custom_command (OUTPUT ${_gwd_gschema_generated_location}
-			    COMMAND cp -r ${_gwd_gschema_filepath} ${_gwd_gschema_generated_location}
-			    DEPENDS ${_gwd_gschema_filepath}
-			    VERBATIM)
-
-	add_custom_target (compiz_gwd_gsettings_org_compiz_gwd_schema ALL
-			   DEPENDS ${_gwd_gschema_generated_location})
-
-	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_compiz_gwd_schema)
-
-	compiz_install_gsettings_schema (${_gwd_gschema_generated_location}
-					 ${_gwd_gschema_dest})
-    endif (USE_GSETTINGS)
+    add_library (gtk_window_decorator_settings_storage_gsettings STATIC
+                 ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-storage-gsettings.c)
+
+    compiz_pkg_check_modules (GSETTINGS gio-2.0 glib-2.0)
+
+    target_link_libraries (gtk_window_decorator_settings_storage_gsettings
+                           ${GSETTINGS_LIBRARIES})
+
+    list (APPEND GTK_WINDOW_DECORATOR_ADDITIONAL_LIBRARIES
+          gtk_window_decorator_settings_storage_gsettings)
+
+    set (_gwd_gschema_name org.compiz.gwd)
+    set (_gwd_gschema_filename ${_gwd_gschema_name}.gschema.xml)
+    set (_gwd_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_gwd_gschema_filename})
+    set (_gwd_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_gwd_gschema_filename})
+    set (_gwd_gschema_dest ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/)
+
+    add_custom_command (OUTPUT ${_gwd_gschema_generated_location}
+                        COMMAND cp -r ${_gwd_gschema_filepath} ${_gwd_gschema_generated_location}
+                        DEPENDS ${_gwd_gschema_filepath}
+                        VERBATIM)
+
+    add_custom_target (compiz_gwd_gsettings_org_compiz_gwd_schema ALL
+                       DEPENDS ${_gwd_gschema_generated_location})
+
+    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_compiz_gwd_schema)
+
+    compiz_install_gsettings_schema (${_gwd_gschema_generated_location}
+                                     ${_gwd_gschema_dest})
 
     add_executable (gtk-window-decorator
 		    gtk-window-decorator.c

=== modified file 'gtk/window-decorator/settings.c'
--- gtk/window-decorator/settings.c	2016-03-15 12:58:29 +0000
+++ gtk/window-decorator/settings.c	2016-05-12 10:19:12 +0000
@@ -22,11 +22,7 @@
 #include "gtk-window-decorator.h"
 #include "gwd-settings-writable-interface.h"
 #include "gwd-settings-storage-interface.h"
-
-#ifdef USE_GSETTINGS
 #include "gwd-settings-storage-gsettings.h"
-#endif
-
 #include "gwd-settings-xproperty-storage.h"
 
 GWDSettingsStorage *storage = NULL;
@@ -36,8 +32,6 @@
 init_settings (GWDSettingsWritable *writable,
 	       WnckScreen	    *screen)
 {
-#ifdef USE_GSETTINGS
-#define STORAGE_USED
     GSettings *compiz = gwd_get_org_compiz_gwd_settings ();
     GSettings *metacity = gwd_get_org_gnome_metacity_settings ();
     GSettings *gnome  = gwd_get_org_gnome_desktop_wm_preferences_settings ();
@@ -49,11 +43,9 @@
     gwd_connect_org_gnome_metacity_settings (metacity, storage);
     gwd_connect_org_gnome_desktop_wm_preferences_settings (gnome, storage);
     gwd_connect_org_mate_marco_general_settings (marco, storage);
-#endif
 
     xprop_storage = gwd_settings_xproperty_storage_new (writable);
 
-#ifdef STORAGE_USED
     gwd_settings_storage_update_metacity_theme (storage);
     gwd_settings_storage_update_opacity (storage);
     gwd_settings_storage_update_button_layout (storage);
@@ -62,11 +54,6 @@
     gwd_settings_storage_update_blur (storage);
     gwd_settings_storage_update_use_tooltips (storage);
     gwd_process_decor_shadow_property_update ();
-#else
-    storage = NULL;
-#endif
-
-#undef STORAGE_USED
 
     return TRUE;
 }

=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2016-03-18 18:56:12 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -58,62 +58,58 @@
 	 gtk_window_decorator_settings_storage_interface
 	 gtk_window_decorator_settings_notified_interface)
 
-    if (USE_GSETTINGS)
-	add_definitions (-DUSE_GSETTINGS)
-	set (_desktop_gschema_name org.gnome.desktop.wm.preferences)
-	set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml)
-	set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename})
-	set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename})
-
-	add_custom_command (OUTPUT ${_desktop_gschema_generated_location}
-			    COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location}
-			    DEPENDS ${_desktop_gschema_filepath}
-			    VERBATIM)
-
-	add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL
-			   DEPENDS ${_desktop_gschema_generated_location})
-
-	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema)
-
-	set (_metacity_gschema_name org.gnome.metacity)
-	set (_metacity_gschema_filename ${_metacity_gschema_name}.gschema.xml)
-	set (_metacity_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_metacity_gschema_filename})
-	set (_metacity_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_metacity_gschema_filename})
-
-	add_custom_command (OUTPUT ${_metacity_gschema_generated_location}
-			    COMMAND cp -r ${_metacity_gschema_filepath} ${_metacity_gschema_generated_location}
-			    DEPENDS ${_metacity_gschema_filepath}
-			    VERBATIM)
-
-	add_custom_target (compiz_gwd_gsettings_org_gnome_metacity_schema ALL
-			   DEPENDS ${_metacity_gschema_generated_location})
-
-	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_metacity_schema)
-
-	set (_marco_gschema_name org.mate.marco)
-	set (_marco_gschema_filename ${_marco_gschema_name}.gschema.xml)
-	set (_marco_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_marco_gschema_filename})
-	set (_marco_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_marco_gschema_filename})
-
-	add_custom_command (OUTPUT ${_marco_gschema_generated_location}
-			    COMMAND cp -r ${_marco_gschema_filepath} ${_marco_gschema_generated_location}
-			    DEPENDS ${_marco_gschema_filepath}
-			    VERBATIM)
-
-	add_custom_target (compiz_gwd_gsettings_org_mate_marco_schema ALL
-			   DEPENDS ${_marco_gschema_generated_location})
-
-	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_mate_marco_schema)
-
-	set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
-	     ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
-	     gtk_window_decorator_settings_storage_gsettings)
-
-	set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
-	     ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS}
-	    gtk_window_decorator_settings_storage_gsettings)
-    endif (USE_GSETTINGS)
-
+    set (_desktop_gschema_name org.gnome.desktop.wm.preferences)
+    set (_desktop_gschema_filename ${_desktop_gschema_name}.gschema.xml)
+    set (_desktop_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_desktop_gschema_filename})
+    set (_desktop_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_desktop_gschema_filename})
+
+    add_custom_command (OUTPUT ${_desktop_gschema_generated_location}
+                        COMMAND cp -r ${_desktop_gschema_filepath} ${_desktop_gschema_generated_location}
+                        DEPENDS ${_desktop_gschema_filepath}
+                        VERBATIM)
+
+    add_custom_target (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema ALL
+                       DEPENDS ${_desktop_gschema_generated_location})
+
+    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_desktop_wm_preferences_schema)
+
+    set (_metacity_gschema_name org.gnome.metacity)
+    set (_metacity_gschema_filename ${_metacity_gschema_name}.gschema.xml)
+    set (_metacity_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_metacity_gschema_filename})
+    set (_metacity_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_metacity_gschema_filename})
+
+    add_custom_command (OUTPUT ${_metacity_gschema_generated_location}
+                        COMMAND cp -r ${_metacity_gschema_filepath} ${_metacity_gschema_generated_location}
+                        DEPENDS ${_metacity_gschema_filepath}
+                        VERBATIM)
+
+    add_custom_target (compiz_gwd_gsettings_org_gnome_metacity_schema ALL
+                       DEPENDS ${_metacity_gschema_generated_location})
+
+    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_metacity_schema)
+
+    set (_marco_gschema_name org.mate.marco)
+    set (_marco_gschema_filename ${_marco_gschema_name}.gschema.xml)
+    set (_marco_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_marco_gschema_filename})
+    set (_marco_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_marco_gschema_filename})
+
+    add_custom_command (OUTPUT ${_marco_gschema_generated_location}
+                        COMMAND cp -r ${_marco_gschema_filepath} ${_marco_gschema_generated_location}
+                        DEPENDS ${_marco_gschema_filepath}
+                        VERBATIM)
+
+    add_custom_target (compiz_gwd_gsettings_org_mate_marco_schema ALL
+                       DEPENDS ${_marco_gschema_generated_location})
+
+    add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_mate_marco_schema)
+
+    set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
+         ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
+         gtk_window_decorator_settings_storage_gsettings)
+
+    set (COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS
+         ${COMPIZ_TEST_GWD_SETTINGS_COVERAGE_TARGETS}
+         gtk_window_decorator_settings_storage_gsettings)
 
     target_link_libraries (compiz_test_gwd_settings
 			   ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}

=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2016-03-18 18:36:50 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2016-05-12 10:19:12 +0000
@@ -1414,7 +1414,6 @@
 INSTANTIATE_TEST_CASE_P (MockStorageUpdates, GWDSettingsTestStorageUpdates,
 			 ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDMockSettingsStorageFactoryWrapper ())));
 
-#ifdef USE_GSETTINGS
 class GWDSettingsStorageGSettingsTest :
     public GWDSettingsTestCommon
 {
@@ -1579,5 +1578,3 @@
 
 INSTANTIATE_TEST_CASE_P (GSettingsStorageUpdates, GWDSettingsTestStorageUpdates,
 			 ::testing::Values (boost::shared_ptr <GWDSettingsStorageFactoryWrapperInterface> (new GWDSettingsStorageGSettingsFactoryWrapper ())));
-
-#endif

=== modified file 'metadata/CMakeLists.txt'
--- metadata/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ metadata/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -40,16 +40,14 @@
     DEPENDS ${_core_xml_file}
 )
 
-if (USE_GSETTINGS)
-    set (_core_gschema_path ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.core.gschema.xml)
-    compiz_gsettings_schema (
-	compiz
-	${_core_xml_file}
-	${_core_gschema_path}
-	${datadir}/glib-2.0/schemas
-    )
-    add_custom_target (core-settings-schema ALL
-	DEPENDS ${_core_gschema_path}
-	        core-xml-file
-    )
-endif ()
+set (_core_gschema_path ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.core.gschema.xml)
+compiz_gsettings_schema (
+    compiz
+    ${_core_xml_file}
+    ${_core_gschema_path}
+    ${datadir}/glib-2.0/schemas
+)
+add_custom_target (core-settings-schema ALL
+    DEPENDS ${_core_gschema_path}
+            core-xml-file
+)

=== modified file 'postinst/CMakeLists.txt'
--- postinst/CMakeLists.txt	2012-09-10 07:49:26 +0000
+++ postinst/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -6,9 +6,5 @@
 	      PROPERTY GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE
 	      FALSE)
 
-if (USE_GSETTINGS)
-
-    compiz_add_install_recompile_gsettings_schemas (${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas)
-    add_all_gsettings_schemas_to_local_recompilation_rule ()
-
-endif (USE_GSETTINGS)
+compiz_add_install_recompile_gsettings_schemas (${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas)
+add_all_gsettings_schemas_to_local_recompilation_rule ()

=== modified file 'xslt/CMakeLists.txt'
--- xslt/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ xslt/CMakeLists.txt	2016-05-12 10:19:12 +0000
@@ -1,13 +1,10 @@
-
 set (_files
     bcop.xslt
 )
 
 compiz_configure_file (compiz_gsettings_schemas.xslt.in compiz_gsettings_schemas.xslt)
 
-if (USE_GSETTINGS)
-    list (APPEND _files ${CMAKE_CURRENT_BINARY_DIR}/compiz_gsettings_schemas.xslt)
-endif ()
+list (APPEND _files ${CMAKE_CURRENT_BINARY_DIR}/compiz_gsettings_schemas.xslt)
 
 install (
     FILES ${_files}