~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to cmake/CompizCommon.cmake

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
56
56
    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-unused-private-field")
57
57
endif ()
58
58
 
 
59
option (COMPIZ_UNUSED_LOCAL_TYPEDEFS_WARNINGS "Warn about unused local typedefs" OFF)
 
60
if (NOT COMPIZ_UNUSED_LOCAL_TYPEDEFS_WARNINGS)
 
61
    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-unused-local-typedefs")
 
62
endif (NOT COMPIZ_UNUSED_LOCAL_TYPEDEFS_WARNINGS)
 
63
 
59
64
option (COMPIZ_DEPRECATED_WARNINGS "Warn about declarations marked deprecated" OFF)
60
65
if (NOT COMPIZ_DEPRECATED_WARNINGS)
61
66
    set (COMMON_FLAGS "${COMMON_FLAGS} -Wno-deprecated-declarations")