Source release 16.3.0
This commit is contained in:
14
third_party/gmock.gyp
vendored
14
third_party/gmock.gyp
vendored
@@ -12,6 +12,11 @@
|
||||
],
|
||||
'cflags_cc': [
|
||||
'-std=c++11',
|
||||
# gMock violates these warnings
|
||||
'-Wno-deprecated-copy',
|
||||
],
|
||||
'cflags_cc!': [
|
||||
'-Wdeprecated-copy',
|
||||
],
|
||||
'ldflags': [
|
||||
'-fPIC',
|
||||
@@ -27,6 +32,13 @@
|
||||
'googletest/googlemock/include',
|
||||
'googletest/googletest/include',
|
||||
],
|
||||
'cflags_cc': [
|
||||
# gMock's exported headers violate these warnings
|
||||
'-Wno-deprecated-copy',
|
||||
],
|
||||
'cflags_cc!': [
|
||||
'-Wdeprecated-copy',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'OTHER_CFLAGS': [
|
||||
'-Wno-inconsistent-missing-override',
|
||||
@@ -65,7 +77,7 @@
|
||||
'conditions': [
|
||||
['OS!="win"', {
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'libraries': [
|
||||
'-lpthread',
|
||||
],
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user