Merge lp:~compiz-team/compiz/compiz.fix_1095906 into lp:compiz/0.9.9

[Sam Spilsbury]

Disable -Wunused-private-fields until gtest fixes their invalid code.

(LP: #1095906)

Disable -Wunused-private-fields until gtest fixes their invalid code.

(LP: #1095906)

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/340//rebuild/?

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-12-10 11:40:04 +0000
+++ cmake/CompizCommon.cmake	2013-01-04 04:55:26 +0000
@@ -50,6 +50,11 @@
 # Almost everything is a shared library now, so almost everything needs -fPIC
 set (COMMON_FLAGS "-fPIC -Wall")
 
+option (COMPIZ_UNUSED_PRIVATE_FIELD_WARNINGS "Warn unused private fields" OFF)
+if (NOT COMPIZ_UNUSED_PRIVATE_FIELD_WARNINGS)
+    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-unused-private-field")
+endif ()
+
 option (COMPIZ_DEPRECATED_WARNINGS "Warn about declarations marked deprecated" OFF)
 if (NOT COMPIZ_DEPRECATED_WARNINGS)
     set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-deprecated-declarations")