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

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: 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
« no previous file with comments | « testing/gmock.gyp ('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 fe33db5e1f24d49e4b2ff9b5cf25f2b7011ce8d3..05f3bd43fc2d2666275fb3ed711234d815cb7e25 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -29,6 +29,10 @@
'GTEST_LANG_CXX11=0',
],
'all_dependent_settings': {
+ 'include_dirs': [
+ 'gtest',
brettw 2016/07/21 19:38:27 You added this one. I don't see this in the GN bui
tzik 2016/07/21 19:57:33 Oops, thanks. A local mod contaminated the path as
+ 'gtest/include',
+ ],
'defines': [
'GTEST_HAS_POSIX_RE=0',
'GTEST_LANG_CXX11=0',
@@ -121,9 +125,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 »

Powered by Google App Engine
This is Rietveld 408576698