| Index: testing/gmock.gyp
|
| diff --git a/testing/gmock.gyp b/testing/gmock.gyp
|
| index dd446f21c26dfa6a17aa993836eb488a6013703f..aa84be810821a7c5858b05b467c353dcf7ca2093 100644
|
| --- a/testing/gmock.gyp
|
| +++ b/testing/gmock.gyp
|
| @@ -52,16 +52,6 @@
|
| 'export_dependent_settings': [
|
| 'gtest.gyp:gtest',
|
| ],
|
| - 'conditions': [
|
| - ['OS=="win"', {
|
| - 'dependencies': [
|
| - '../third_party/boost/boost.gyp:boost_tuple',
|
| - ],
|
| - 'export_dependent_settings': [
|
| - '../third_party/boost/boost.gyp:boost_tuple',
|
| - ]
|
| - }],
|
| - ],
|
| },
|
| {
|
| # Note that calling this "gmock_main" confuses the scons build,
|
|
|