Index: third_party/gmock/gmock.gyp |
diff --git a/third_party/gmock/gmock.gyp b/third_party/gmock/gmock.gyp |
index b9e5f186e22b7da4b7173d178a492fbb6c08850c..22c22b143f40c670f183be6875e872cf595e4787 100644 |
--- a/third_party/gmock/gmock.gyp |
+++ b/third_party/gmock/gmock.gyp |
@@ -13,178 +13,208 @@ |
# limitations under the License. |
{ |
- 'targets': [ |
- { |
- 'target_name': 'gmock', |
- 'type': 'static_library', |
- 'dependencies': [ |
- '../gtest/gtest.gyp:gtest', |
- ], |
- 'include_dirs': [ |
- 'gmock', |
- 'gmock/include', |
- ], |
- 'sources': [ |
- '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-more-actions.h', |
- 'gmock/include/gmock/gmock-more-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', |
- ], |
- 'sources!': [ |
- 'gmock/src/gmock-all.cc', |
- ], |
+ 'includes': [ |
+ '../../build/crashpad_in_chromium.gypi', |
+ ], |
+ 'conditions': [ |
+ ['crashpad_in_chromium==0', { |
+ 'targets': [ |
+ { |
+ 'target_name': 'gmock', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ '../gtest/gtest.gyp:gtest', |
+ ], |
+ 'include_dirs': [ |
+ 'gmock', |
+ 'gmock/include', |
+ ], |
+ 'sources': [ |
+ '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-more-actions.h', |
+ 'gmock/include/gmock/gmock-more-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', |
+ ], |
+ 'sources!': [ |
+ 'gmock/src/gmock-all.cc', |
+ ], |
- # gmock relies heavily on objects with static storage duration. |
- 'xcode_settings': { |
- 'WARNING_CFLAGS!': [ |
- '-Wexit-time-destructors', |
- ], |
- }, |
- 'cflags!': [ |
- '-Wexit-time-destructors', |
- ], |
+ # gmock relies heavily on objects with static storage duration. |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS!': [ |
+ '-Wexit-time-destructors', |
+ ], |
+ }, |
+ 'cflags!': [ |
+ '-Wexit-time-destructors', |
+ ], |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- 'gmock/include', |
- ], |
- 'conditions': [ |
- ['clang!=0', { |
- # The MOCK_METHODn() macros do not specify “override”, which |
- # triggers this warning in users: “error: 'Method' overrides a |
- # member function but is not marked 'override' |
- # [-Werror,-Winconsistent-missing-override]”. Suppress these |
- # warnings, and add -Wno-unknown-warning-option because only recent |
- # versions of clang (trunk r220703 and later, version 3.6 and |
- # later) recognize it. |
+ 'direct_dependent_settings': { |
+ 'include_dirs': [ |
+ 'gmock/include', |
+ ], |
'conditions': [ |
- ['OS=="mac"', { |
- 'xcode_settings': { |
- 'WARNING_CFLAGS': [ |
- '-Wno-inconsistent-missing-override', |
- '-Wno-unknown-warning-option', |
- ], |
- }, |
- }], |
- ['OS=="linux"', { |
- 'cflags': [ |
- '-Wno-inconsistent-missing-override', |
- '-Wno-unknown-warning-option', |
+ ['clang!=0', { |
+ # The MOCK_METHODn() macros do not specify “override”, which |
+ # triggers this warning in users: “error: 'Method' overrides a |
+ # member function but is not marked 'override' |
+ # [-Werror,-Winconsistent-missing-override]”. Suppress these |
+ # warnings, and add -Wno-unknown-warning-option because only |
+ # recent versions of clang (trunk r220703 and later, version |
+ # 3.6 and later) recognize it. |
+ 'conditions': [ |
+ ['OS=="mac"', { |
+ 'xcode_settings': { |
+ 'WARNING_CFLAGS': [ |
+ '-Wno-inconsistent-missing-override', |
+ '-Wno-unknown-warning-option', |
+ ], |
+ }, |
+ }], |
+ ['OS=="linux"', { |
+ 'cflags': [ |
+ '-Wno-inconsistent-missing-override', |
+ '-Wno-unknown-warning-option', |
+ ], |
+ }], |
], |
}], |
], |
- }], |
- ], |
- }, |
- 'export_dependent_settings': [ |
- '../gtest/gtest.gyp:gtest', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_main', |
- 'type': 'static_library', |
- 'dependencies': [ |
- 'gmock', |
- '../gtest/gtest.gyp:gtest', |
- ], |
- 'sources': [ |
- 'gmock/src/gmock_main.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_test_executable', |
- 'type': 'none', |
- 'dependencies': [ |
- 'gmock', |
- '../gtest/gtest.gyp:gtest', |
- ], |
- 'direct_dependent_settings': { |
- 'type': 'executable', |
- 'include_dirs': [ |
- 'gmock', |
- ], |
- }, |
- 'export_dependent_settings': [ |
- 'gmock', |
- '../gtest/gtest.gyp:gtest', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_all_test', |
- 'dependencies': [ |
- 'gmock_test_executable', |
- 'gmock_main', |
- ], |
- 'sources': [ |
- 'gmock/test/gmock-actions_test.cc', |
- 'gmock/test/gmock-cardinalities_test.cc', |
- 'gmock/test/gmock-generated-actions_test.cc', |
- 'gmock/test/gmock-generated-function-mockers_test.cc', |
- 'gmock/test/gmock-generated-internal-utils_test.cc', |
- 'gmock/test/gmock-generated-matchers_test.cc', |
- 'gmock/test/gmock-internal-utils_test.cc', |
- 'gmock/test/gmock-matchers_test.cc', |
- 'gmock/test/gmock-more-actions_test.cc', |
- 'gmock/test/gmock-nice-strict_test.cc', |
- 'gmock/test/gmock-port_test.cc', |
- 'gmock/test/gmock_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_link_test', |
- 'dependencies': [ |
- 'gmock_test_executable', |
- 'gmock_main', |
- ], |
- 'sources': [ |
- 'gmock/test/gmock_link_test.cc', |
- 'gmock/test/gmock_link_test.h', |
- 'gmock/test/gmock_link2_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_spec_builders_test', |
- 'dependencies': [ |
- 'gmock_test_executable', |
- ], |
- 'sources': [ |
- 'gmock/test/gmock-spec-builders_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_stress_test', |
- 'dependencies': [ |
- 'gmock_test_executable', |
- ], |
- 'sources': [ |
- 'gmock/test/gmock_stress_test.cc', |
- ], |
- }, |
- { |
- 'target_name': 'gmock_all_tests', |
- 'type': 'none', |
- 'dependencies': [ |
- 'gmock_all_test', |
- 'gmock_link_test', |
- 'gmock_spec_builders_test', |
- 'gmock_stress_test', |
- ], |
- }, |
+ }, |
+ 'export_dependent_settings': [ |
+ '../gtest/gtest.gyp:gtest', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_main', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ 'gmock', |
+ '../gtest/gtest.gyp:gtest', |
+ ], |
+ 'sources': [ |
+ 'gmock/src/gmock_main.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_test_executable', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'gmock', |
+ '../gtest/gtest.gyp:gtest', |
+ ], |
+ 'direct_dependent_settings': { |
+ 'type': 'executable', |
+ 'include_dirs': [ |
+ 'gmock', |
+ ], |
+ }, |
+ 'export_dependent_settings': [ |
+ 'gmock', |
+ '../gtest/gtest.gyp:gtest', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_all_test', |
+ 'dependencies': [ |
+ 'gmock_test_executable', |
+ 'gmock_main', |
+ ], |
+ 'sources': [ |
+ 'gmock/test/gmock-actions_test.cc', |
+ 'gmock/test/gmock-cardinalities_test.cc', |
+ 'gmock/test/gmock-generated-actions_test.cc', |
+ 'gmock/test/gmock-generated-function-mockers_test.cc', |
+ 'gmock/test/gmock-generated-internal-utils_test.cc', |
+ 'gmock/test/gmock-generated-matchers_test.cc', |
+ 'gmock/test/gmock-internal-utils_test.cc', |
+ 'gmock/test/gmock-matchers_test.cc', |
+ 'gmock/test/gmock-more-actions_test.cc', |
+ 'gmock/test/gmock-nice-strict_test.cc', |
+ 'gmock/test/gmock-port_test.cc', |
+ 'gmock/test/gmock_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_link_test', |
+ 'dependencies': [ |
+ 'gmock_test_executable', |
+ 'gmock_main', |
+ ], |
+ 'sources': [ |
+ 'gmock/test/gmock_link_test.cc', |
+ 'gmock/test/gmock_link_test.h', |
+ 'gmock/test/gmock_link2_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_spec_builders_test', |
+ 'dependencies': [ |
+ 'gmock_test_executable', |
+ ], |
+ 'sources': [ |
+ 'gmock/test/gmock-spec-builders_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_stress_test', |
+ 'dependencies': [ |
+ 'gmock_test_executable', |
+ ], |
+ 'sources': [ |
+ 'gmock/test/gmock_stress_test.cc', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_all_tests', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'gmock_all_test', |
+ 'gmock_link_test', |
+ 'gmock_spec_builders_test', |
+ 'gmock_stress_test', |
+ ], |
+ }, |
+ ], |
+ }, { # else: crashpad_in_chromium!=0 |
+ 'targets': [ |
+ { |
+ 'target_name': 'gmock', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ '../../../../../testing/gmock.gyp:gmock', |
Robert Sesek
2015/03/09 18:37:19
This would make moving the crashpad project in ups
Mark Mentovai
2015/03/09 19:18:09
Robert Sesek wrote:
|
+ ], |
+ 'export_dependent_settings': [ |
+ '../../../../../testing/gmock.gyp:gmock', |
+ ], |
+ }, |
+ { |
+ 'target_name': 'gmock_main', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ '../../../../../testing/gmock.gyp:gmock_main', |
+ ], |
+ 'export_dependent_settings': [ |
+ '../../../../../testing/gmock.gyp:gmock_main', |
+ ], |
+ }, |
+ ], |
+ }], |
], |
} |