Merge lp:~compiz-team/compiz/compiz.fix_1046701 into lp:compiz/0.9.8

[Sam Spilsbury]

Regenerate the local settings recompilation rule when cmake is re-run
and ensure that we pull in all the dependencies.

This fixes the case where a new gsettings schema got added for building but it wasn't recompiled locally, which could cause test failures because ... gsettings.

(LP: #1046701)

Regenerate the local settings recompilation rule when cmake is re-run
and ensure that we pull in all the dependencies.

This fixes the case where a new gsettings schema got added for building but it wasn't recompiled locally, which could cause test failures because ... gsettings.

(LP: #1046701)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3361
http://jenkins.qa.ubuntu.com/job/compiz-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/61/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Seems to work...

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-09-05 20:45:21 +0000
+++ CMakeLists.txt	2012-09-10 08:01:41 +0000
@@ -79,6 +79,9 @@
 
 # Don't allow subdirectories to add schema recompile rule
 set_property (GLOBAL
+	      PROPERTY GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE
+	      TRUE)
+set_property (GLOBAL
 	      PROPERTY COMPIZ_INHIBIT_ADD_INSTALL_RECOMPILE_RULE
 	      TRUE)
 

=== modified file 'cmake/CompizGSettings.cmake'
--- cmake/CompizGSettings.cmake	2012-08-31 04:18:02 +0000
+++ cmake/CompizGSettings.cmake	2012-09-10 08:01:41 +0000
@@ -106,37 +106,83 @@
 	   USE_GSETTINGS)
 endfunction ()
 
-function (add_gsettings_schema_to_recompilation_list _target_name_for_schema)
-
-    find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
-    mark_as_advanced (GLIB_COMPILE_SCHEMAS)
+function (add_gsettings_local_recompilation_rule _schemas)
+
+    get_property (GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE_SET
+		  GLOBAL
+		  PROPERTY GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE
+		  SET)
+
+    if (GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE_SET)
+	get_property (GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE
+		      GLOBAL
+		      PROPERTY GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE)
+    else (GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE_SET)
+	set (GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE FALSE)
+    endif (GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE_SET)
 
     get_property (GSETTINGS_LOCAL_COMPILE_TARGET_SET
 		  GLOBAL
 		  PROPERTY GSETTINGS_LOCAL_COMPILE_TARGET_SET
 		  SET)
 
-    if (NOT GSETTINGS_LOCAL_COMPILE_TARGET_SET AND
-	GLIB_COMPILE_SCHEMAS)
-
-	add_custom_command (OUTPUT ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/gschemas.compiled
-			   COMMAND ${GLIB_COMPILE_SCHEMAS} --targetdir=${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/
-                    	   ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/
-			   COMMENT "Recompiling GSettings schemas locally"
-	)
-
-	add_custom_target (compiz_gsettings_compile_local ALL
-			   DEPENDS ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/gschemas.compiled)
-
-	set_property (GLOBAL
-		      PROPERTY GSETTINGS_LOCAL_COMPILE_TARGET_SET
-		      TRUE)
-
-    endif (NOT GSETTINGS_LOCAL_COMPILE_TARGET_SET AND
-	   GLIB_COMPILE_SCHEMAS)
-
-    add_dependencies (compiz_gsettings_compile_local
-		      ${_target_name_for_schema})
+    if (NOT GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE AND
+	NOT GSETTINGS_LOCAL_COMPILE_TARGET_SET)
+
+	find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
+	mark_as_advanced (GLIB_COMPILE_SCHEMAS)
+
+	if (GLIB_COMPILE_SCHEMAS)
+
+	    set (_compiled_gschemas ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/gschemas.compiled)
+
+	    # Invalidate the rule
+	    if (EXISTS ${_compiled_gschemas})
+		execute_process (COMMAND rm ${_compiled_gschemas})
+	    endif (EXISTS ${_compiled_gschemas})
+
+	    add_custom_command (OUTPUT ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/gschemas.compiled
+				COMMAND ${GLIB_COMPILE_SCHEMAS} --targetdir=${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/
+				${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/
+				COMMENT "Recompiling GSettings schemas locally"
+				DEPENDS ${${_schemas}}
+	    )
+
+	    add_custom_target (compiz_gsettings_compile_local ALL
+			       DEPENDS ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/gschemas.compiled)
+
+	    set_property (GLOBAL
+			  PROPERTY GSETTINGS_LOCAL_COMPILE_TARGET_SET
+			  TRUE)
+
+	endif (GLIB_COMPILE_SCHEMAS)
+
+    endif (NOT GSETTINGS_LOCAL_COMPILE_INHIBIT_RULE AND
+	   NOT GSETTINGS_LOCAL_COMPILE_TARGET_SET)
+
+endfunction ()
+
+function (add_all_gsettings_schemas_to_local_recompilation_rule)
+
+    get_property (GSETTINGS_LOCAL_COMPILE_SCHEMAS
+		  GLOBAL
+		  PROPERTY GSETTINGS_LOCAL_COMPILE_SCHEMAS)
+
+    # Deferencing it appears to just give it the first schema, that's not what
+    # we really want, so just pass the reference and double-dereference
+    # internally
+    add_gsettings_local_recompilation_rule (GSETTINGS_LOCAL_COMPILE_SCHEMAS)
+
+endfunction ()
+
+function (add_gsettings_schema_to_recompilation_list _schema_file_name)
+
+    set_property (GLOBAL
+		  APPEND
+		  PROPERTY GSETTINGS_LOCAL_COMPILE_SCHEMAS
+		  "${_schema_file_name}")
+
+    add_all_gsettings_schemas_to_local_recompilation_rule ()
 
 endfunction ()
 

=== modified file 'postinst/CMakeLists.txt'
--- postinst/CMakeLists.txt	2012-07-09 04:06:21 +0000
+++ postinst/CMakeLists.txt	2012-09-10 08:01:41 +0000
@@ -1,10 +1,14 @@
-# Don't allow subdirectories to add schema recompile rule
+# Allow setting the recompile rule again
 set_property (GLOBAL
 	      PROPERTY COMPIZ_INHIBIT_ADD_INSTALL_RECOMPILE_RULE
 	      FALSE)
+set_property (GLOBAL
+	      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)