diff options
Diffstat (limited to 'src/client/windows')
| -rw-r--r-- | src/client/windows/unittests/testing.gyp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/client/windows/unittests/testing.gyp b/src/client/windows/unittests/testing.gyp index 2630264e..3234f46c 100644 --- a/src/client/windows/unittests/testing.gyp +++ b/src/client/windows/unittests/testing.gyp @@ -49,8 +49,13 @@ 'include_dirs': [ '<(DEPTH)/testing/include', '<(DEPTH)/testing/gtest/include', - ] + ], + # Visual C++ implements variadic templates strangely, and + # VC++2012 broke Google Test by lowering this value. See + # http://stackoverflow.com/questions/12558327/google-test-in-visual-studio-2012 + 'defines': ['_VARIADIC_MAX=10'], }, + 'defines': ['_VARIADIC_MAX=10'], }, { 'target_name': 'gmock', @@ -69,8 +74,10 @@ 'include_dirs': [ '<(DEPTH)/testing/include', '<(DEPTH)/testing/gtest/include', - ] + ], + 'defines': ['_VARIADIC_MAX=10'], }, + 'defines': ['_VARIADIC_MAX=10'], }, ], |