yuzu-emu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2024-11-28 04:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix googletest/googlemock build

Browse Source 
1. testing.gyp is a gyp file, not a gypi file. It is only referenced in
“dependencies” sections. The gypi extension is used for files that are
included by an “includes” section.

2. Update paths in testing.gyp to reflect the real locations of
googletest and googlemock following their merge into a single
repository.

Change-Id: If9c356d93aa5ffda54af46fbed648baa2274dac6
Reviewed-on: https://chromium-review.googlesource.com/673404
Reviewed-by: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mark Mentovai 2017-09-19 14:43:07 -04:00
parent afa9c52715
commit 491f174949
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/build/testing.gypi → src/build/testing.gyp
View File

@ -32,15 +32,15 @@
'target_name': 'gtest',
'type': 'static_library',
'sources': [
'../testing/gtest/src/gtest-all.cc',
'../testing/googletest/src/gtest-all.cc',
],
'include_dirs': [
'../testing/gtest',
'../testing/gtest/include',
'../testing/googletest',
'../testing/googletest/include',
],
'direct_dependent_settings': {
'include_dirs': [
'../testing/gtest/include',
'../testing/googletest/include',
],
},
},
@ -51,7 +51,7 @@
'gtest',
],
'sources': [
'gtest/src/gtest_main.cc',
'../testing/googletest/src/gtest_main.cc',
],
},
{
@ -61,15 +61,15 @@
'gtest',
],
'sources': [
'../testing/src/gmock-all.cc',
'../testing/googlemock/src/gmock-all.cc',
],
'include_dirs': [
'../testing',
'../testing/include',
'../testing/googlemock',
'../testing/googlemock/include',
],
'direct_dependent_settings': {
'include_dirs': [
'../testing/include',
'../testing/googlemock/include',
],
},
'export_dependent_settings': [
@ -83,7 +83,7 @@
'gmock',
],
'sources': [
'../testing/src/gmock_main.cc',
'../testing/googlemock/src/gmock_main.cc',
],
},
],

6
src/common/common.gyp
View File

@ -238,9 +238,9 @@
],
'dependencies': [
'common',
'../build/testing.gypi:gmock_main',
'../build/testing.gypi:gmock',
'../build/testing.gypi:gtest',
'../build/testing.gyp:gmock_main',
'../build/testing.gyp:gmock',
'../build/testing.gyp:gtest',
],
'libraries': [
'-ldl',

4
src/processor/processor.gyp
View File

@ -176,8 +176,8 @@
],
'dependencies': [
'processor',
'../build/testing.gypi:gmock',
'../build/testing.gypi:gtest',
'../build/testing.gyp:gmock',
'../build/testing.gyp:gtest',
],
},
],