Unified Diff: third_party/googletest.gyp
Issue 29339280:
No issue - update google test framework (Closed)
Patch Set:
Created April 1, 2016, 2:32 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« dependencies ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: third_party/googletest.gyp |
| diff --git a/third_party/googletest.gyp b/third_party/googletest.gyp |
| index 6c63b7922cbf6e80d136ef82548e48f3afcd8f31..d8c94f86f46fe57e91090c0814e53f87e80e5e44 100644 |
| --- a/third_party/googletest.gyp |
| +++ b/third_party/googletest.gyp |
| @@ -58,22 +58,22 @@ |
| 'target_name': 'googletest', |
| 'type': '<(library)', |
| 'sources': [ |
| - 'googletest/src/gtest-death-test.cc', |
| - 'googletest/src/gtest-filepath.cc', |
| - 'googletest/src/gtest-port.cc', |
| - 'googletest/src/gtest-printers.cc', |
| - 'googletest/src/gtest-test-part.cc', |
| - 'googletest/src/gtest-typed-test.cc', |
| - 'googletest/src/gtest.cc' |
| + 'googletest/googletest/src/gtest-death-test.cc', |
| + 'googletest/googletest/src/gtest-filepath.cc', |
| + 'googletest/googletest/src/gtest-port.cc', |
| + 'googletest/googletest/src/gtest-printers.cc', |
| + 'googletest/googletest/src/gtest-test-part.cc', |
| + 'googletest/googletest/src/gtest-typed-test.cc', |
| + 'googletest/googletest/src/gtest.cc' |
| ], |
| 'include_dirs': [ |
| - 'googletest', |
| - 'googletest/include' |
| + 'googletest/googletest', |
| + 'googletest/googletest/include' |
| ], |
| 'direct_dependent_settings': { |
| 'include_dirs': [ |
| - 'googletest', |
| - 'googletest/include' |
| + 'googletest/googletest', |
| + 'googletest/googletest/include' |
| ] |
| }, |
| 'conditions': [[ |
| @@ -88,7 +88,7 @@ |
| { |
| 'target_name': 'googletest_main', |
| 'type': '<(library)', |
| - 'sources': ['googletest/src/gtest_main.cc'], |
| + 'sources': ['googletest/googletest/src/gtest_main.cc'], |
| 'dependencies': ['googletest'], |
| 'export_dependent_settings': ['googletest'] |
| }] |
« no previous file with comments
|
« dependencies ('k')
|
no next file »
|
no next file with comments »
