| Index: testing/gmock.gyp
|
| diff --git a/testing/gmock.gyp b/testing/gmock.gyp
|
| index 89c97e32ec57d69f0b33ed9fa8254e3b463a457d..f95551a954c40fd7728b25422d7faa97f8baffa4 100644
|
| --- a/testing/gmock.gyp
|
| +++ b/testing/gmock.gyp
|
| @@ -8,47 +8,14 @@
|
| 'target_name': 'gmock',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'gtest.gyp:gtest',
|
| + '../third_party/googletest/googlemock.gyp:googlemock',
|
| ],
|
| 'sources': [
|
| - # Sources based on files in r173 of gmock.
|
| 'gmock/include/gmock/gmock-actions.h',
|
| - 'gmock/include/gmock/gmock-cardinalities.h',
|
| - 'gmock/include/gmock/gmock-generated-actions.h',
|
| 'gmock/include/gmock/gmock-generated-function-mockers.h',
|
| - 'gmock/include/gmock/gmock-generated-matchers.h',
|
| - 'gmock/include/gmock/gmock-generated-nice-strict.h',
|
| 'gmock/include/gmock/gmock-matchers.h',
|
| - 'gmock/include/gmock/gmock-spec-builders.h',
|
| 'gmock/include/gmock/gmock.h',
|
| - 'gmock/include/gmock/internal/gmock-generated-internal-utils.h',
|
| - 'gmock/include/gmock/internal/gmock-internal-utils.h',
|
| - 'gmock/include/gmock/internal/gmock-port.h',
|
| - 'gmock/src/gmock-all.cc',
|
| - 'gmock/src/gmock-cardinalities.cc',
|
| - 'gmock/src/gmock-internal-utils.cc',
|
| - 'gmock/src/gmock-matchers.cc',
|
| - 'gmock/src/gmock-spec-builders.cc',
|
| - 'gmock/src/gmock.cc',
|
| 'gmock-support.h', # gMock helpers
|
| - 'gmock_custom/gmock/internal/custom/gmock-port.h',
|
| - ],
|
| - 'sources!': [
|
| - 'gmock/src/gmock-all.cc', # Not needed by our build.
|
| - ],
|
| - 'include_dirs': [
|
| - 'gmock_custom',
|
| - 'gmock',
|
| - 'gmock/include',
|
| - ],
|
| - 'all_dependent_settings': {
|
| - 'include_dirs': [
|
| - 'gmock_custom',
|
| - 'gmock/include', # So that gmock headers can find themselves.
|
| - ],
|
| - },
|
| - 'export_dependent_settings': [
|
| - 'gtest.gyp:gtest',
|
| ],
|
| 'conditions': [
|
| ['want_separate_host_toolset==1', {
|
| @@ -62,10 +29,7 @@
|
| 'target_name': 'gmock_main',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| - 'gmock',
|
| - ],
|
| - 'sources': [
|
| - 'gmock/src/gmock_main.cc',
|
| + '../third_party/googletest/googlemock.gyp:googlemock_main',
|
| ],
|
| },
|
| ],
|
|
|