Index: third_party/gmock/gmock.gyp |
diff --git a/third_party/gmock/gmock.gyp b/third_party/gmock/gmock.gyp |
index 3a1dcdad4955b8c4bac0a2db8418187d6d2b4122..b9e5f186e22b7da4b7173d178a492fbb6c08850c 100644 |
--- a/third_party/gmock/gmock.gyp |
+++ b/third_party/gmock/gmock.gyp |
@@ -49,10 +49,48 @@ |
'sources!': [ |
'gmock/src/gmock-all.cc', |
], |
+ |
+ # gmock relies heavily on objects with static storage duration. |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS!': [ |
+ '-Wexit-time-destructors', |
+ ], |
+ }, |
+ 'cflags!': [ |
+ '-Wexit-time-destructors', |
+ ], |
+ |
'direct_dependent_settings': { |
'include_dirs': [ |
'gmock/include', |
], |
+ 'conditions': [ |
+ ['clang!=0', { |
+ # The MOCK_METHODn() macros do not specify “override”, which |
+ # triggers this warning in users: “error: 'Method' overrides a |
+ # member function but is not marked 'override' |
+ # [-Werror,-Winconsistent-missing-override]”. Suppress these |
+ # warnings, and add -Wno-unknown-warning-option because only recent |
+ # versions of clang (trunk r220703 and later, version 3.6 and |
+ # later) recognize it. |
+ 'conditions': [ |
+ ['OS=="mac"', { |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS': [ |
+ '-Wno-inconsistent-missing-override', |
+ '-Wno-unknown-warning-option', |
+ ], |
+ }, |
+ }], |
+ ['OS=="linux"', { |
+ 'cflags': [ |
+ '-Wno-inconsistent-missing-override', |
+ '-Wno-unknown-warning-option', |
+ ], |
+ }], |
+ ], |
+ }], |
+ ], |
}, |
'export_dependent_settings': [ |
'../gtest/gtest.gyp:gtest', |