Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: testing/gtest.gyp

Issue 425333002: Roll gtest and gmock DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Numeric fix Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/libraries/gmock/library.dsc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index e2dc66a21796eb4d8c94ebde65154459aa95761d..f4577df8d23b5025d1ece31405f79a3ac9307b4e 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -55,10 +55,13 @@
# 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',
+ # Chrome doesn't support / require C++11, yet.
+ 'GTEST_LANG_CXX11=0',
],
'all_dependent_settings': {
'defines': [
'GTEST_HAS_POSIX_RE=0',
+ 'GTEST_LANG_CXX11=0',
],
},
'conditions': [
« no previous file with comments | « native_client_sdk/src/libraries/gmock/library.dsc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698