diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 23:21:44 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 23:21:44 +0000 |
| commit | 128cb993ff3bea633db73624683d838a5e2981c6 (patch) | |
| tree | ebf16b180a23221e2fc079fa82a924fd3552cb0e /testing | |
| parent | 54ba048e37d52dc63e692917f61a94b117df2c3d (diff) | |
| download | chromium_src-128cb993ff3bea633db73624683d838a5e2981c6.zip chromium_src-128cb993ff3bea633db73624683d838a5e2981c6.tar.gz chromium_src-128cb993ff3bea633db73624683d838a5e2981c6.tar.bz2 | |
fix for compilation of gtest on VS2012
per http://code.google.com/p/googletest/issues/detail?id=412
R=cpu@chromium.org
BUG=143646
Review URL: https://chromiumcodereview.appspot.com/11088033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gtest.gyp | 12 |
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': [ |