testing/gmock.gyp - Issue 2174663002: Remove GTEST_LANG_CXX11 and switch to C++11 on gtest and gmock

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: testing/gmock.gyp

Issue 2174663002: Remove GTEST_LANG_CXX11 and switch to C++11 on gtest and gmock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 5 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

Index: testing/gmock.gyp

diff --git a/testing/gmock.gyp b/testing/gmock.gyp

index d6bf3a1d3529c87c21d58e6b85727a7d6a76cead..6ef25665da33300923f8d60f9bfb54389e952143 100644

--- a/testing/gmock.gyp

+++ b/testing/gmock.gyp

@@ -36,11 +36,12 @@

'gmock/src/gmock-all.cc', # Not needed by our build.

'include_dirs': [

- 'gmock',

+ 'gmock_custom',

'gmock/include',

'all_dependent_settings': {

'include_dirs': [

+ 'gmock_custom',

'gmock/include', # So that gmock headers can find themselves.

« no previous file with comments | « remoting/remoting_test.gypi ('k') | testing/gmock_custom/gmock/internal/custom/gmock-port.h » ('j') | no next file with comments »