testing/gtest.gyp - Issue 2168983002: Propagate include directories of gtest and gmock to all dependent target

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/gtest.gyp

Issue 2168983002: Propagate include directories of gtest and gmock to all dependent target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gtest_obsolete

Patch Set: -"gtest" inclusion 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/gtest.gyp

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

index fe33db5e1f24d49e4b2ff9b5cf25f2b7011ce8d3..ec8be2acf8e5c40e4568aecf38f12ff5983b090a 100644

--- a/testing/gtest.gyp

+++ b/testing/gtest.gyp

@@ -29,6 +29,9 @@

'GTEST_LANG_CXX11=0',

'all_dependent_settings': {

+ 'include_dirs': [

+ 'gtest/include',

+ ],

'defines': [

'GTEST_HAS_POSIX_RE=0',

'GTEST_LANG_CXX11=0',

@@ -121,9 +124,6 @@

'defines': [

'UNIT_TEST',

- 'include_dirs': [

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

- ],

'target_conditions': [

['_type=="executable"', {

'test': 1,

« no previous file with comments | « testing/gmock.gyp ('k') | no next file » | no next file with comments »