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

Unified Diff: third_party/boost/boost.gyp

Issue 115846: Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005. (Closed)
Patch Set: 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/gtest.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boost/boost.gyp
diff --git a/third_party/boost/boost.gyp b/third_party/boost/boost.gyp
index e1b5be1dd2a497d54a0eeb187a08518b153d0e88..5239a7fa700272c66bb85b4afd8c790fb45ab06f 100644
--- a/third_party/boost/boost.gyp
+++ b/third_party/boost/boost.gyp
@@ -413,9 +413,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
-# TODO(ajwong): Enable with the gmock checkin.
-# 'boost_1_36_0/boost/tr1/tr1',
-# 'boost_1_36_0',
+ 'boost_1_36_0',
],
},
}
« no previous file with comments | « testing/gtest.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698