summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/gtest.gyp12
1 files changed, 11 insertions, 1 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 877c55c..9dfb16f 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -121,7 +121,7 @@
],
},
}],
- ['OS=="android" or (OS=="win" and MSVS_VERSION=="2012")', {
+ ['OS=="android"', {
# We want gtest features that use tr1::tuple, but we currently
# don't support the variadic templates used by libstdc++'s
# implementation. gtest supports this scenario by providing its
@@ -135,6 +135,16 @@
],
},
}],
+ ['OS=="win" and MSVS_VERSION=="2012"', {
+ 'defines': [
+ '_VARIADIC_MAX=10',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ '_VARIADIC_MAX=10',
+ ],
+ },
+ }],
],
'direct_dependent_settings': {
'defines': [