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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/gtest.gyp

Issue 113163: Add gmock into our dependencies. (Closed)
Patch Set: Making gmock work with windows. Requires adding boost. Created 11 years, 7 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') | third_party/boost/LICENSE_1_0.txt » ('j') | 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 c7d5c6258540e4c93a6a0bc4e72498140e49526f..2085a98beb2fb87428b9ae1feac444bf90477199 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -3,9 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'chromium_code': 1,
- },
'includes': [
'../build/common.gypi',
],
@@ -56,8 +53,7 @@
'UNIT_TEST',
],
'include_dirs': [
- 'gtest',
- 'gtest/include',
+ 'gtest/include', # So that gmock headers can find themselves.
],
'target_conditions': [
['_type=="executable"', {'test': 1}],
« no previous file with comments | « testing/gmock.gyp ('k') | third_party/boost/LICENSE_1_0.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698