diff options
Diffstat (limited to 'chromium/testing/gtest.gyp')
| -rw-r--r-- | chromium/testing/gtest.gyp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/chromium/testing/gtest.gyp b/chromium/testing/gtest.gyp index 517bd06e4c5..69b2bf5e529 100644 --- a/chromium/testing/gtest.gyp +++ b/chromium/testing/gtest.gyp @@ -6,6 +6,7 @@ 'targets': [ { 'target_name': 'gtest', + 'toolsets': ['host', 'target'], 'type': 'static_library', 'sources': [ 'gtest/include/gtest/gtest-death-test.h', @@ -50,6 +51,16 @@ 'dependencies': [ 'gtest_prod', ], + 'defines': [ + # In order to allow regex matches in gtest to be shared between Windows + # and other systems, we tell gtest to always use it's internal engine. + 'GTEST_HAS_POSIX_RE=0', + ], + 'all_dependent_settings': { + 'defines': [ + 'GTEST_HAS_POSIX_RE=0', + ], + }, 'conditions': [ ['OS == "mac" or OS == "ios"', { 'sources': [ @@ -165,16 +176,6 @@ ], }, }], - ['OS=="win" and (MSVS_VERSION=="2012" or MSVS_VERSION=="2012e")', { - 'defines': [ - '_VARIADIC_MAX=10', - ], - 'direct_dependent_settings': { - 'defines': [ - '_VARIADIC_MAX=10', - ], - }, - }], ], 'direct_dependent_settings': { 'defines': [ |