Side by Side Diff: third_party/googletest.gyp
Issue 29339280:
No issue - update google test framework (Closed)
Patch Set:
Created April 1, 2016, 2:32 p.m.
| Left: | ||
| Right: |
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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'target_defaults': { | 2 'target_defaults': { |
| 3 'configurations': { | 3 'configurations': { |
| 4 'Debug': { | 4 'Debug': { |
| 5 'defines': [ 'DEBUG' ], | 5 'defines': [ 'DEBUG' ], |
| 6 'msvs_settings': { | 6 'msvs_settings': { |
| 7 'VCCLCompilerTool': { | 7 'VCCLCompilerTool': { |
| 8 'Optimization': '0', | 8 'Optimization': '0', |
| 9 | 9 |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 'xcode_settings': { | 51 'xcode_settings': { |
| 52 'ARCHS': [ 'i386' ], | 52 'ARCHS': [ 'i386' ], |
| 53 }, | 53 }, |
| 54 }, | 54 }, |
| 55 ]] | 55 ]] |
| 56 }, | 56 }, |
| 57 'targets': [{ | 57 'targets': [{ |
| 58 'target_name': 'googletest', | 58 'target_name': 'googletest', |
| 59 'type': '<(library)', | 59 'type': '<(library)', |
| 60 'sources': [ | 60 'sources': [ |
| 61 'googletest/src/gtest-death-test.cc', | 61 'googletest/googletest/src/gtest-death-test.cc', |
| 62 'googletest/src/gtest-filepath.cc', | 62 'googletest/googletest/src/gtest-filepath.cc', |
| 63 'googletest/src/gtest-port.cc', | 63 'googletest/googletest/src/gtest-port.cc', |
| 64 'googletest/src/gtest-printers.cc', | 64 'googletest/googletest/src/gtest-printers.cc', |
| 65 'googletest/src/gtest-test-part.cc', | 65 'googletest/googletest/src/gtest-test-part.cc', |
| 66 'googletest/src/gtest-typed-test.cc', | 66 'googletest/googletest/src/gtest-typed-test.cc', |
| 67 'googletest/src/gtest.cc' | 67 'googletest/googletest/src/gtest.cc' |
| 68 ], | 68 ], |
| 69 'include_dirs': [ | 69 'include_dirs': [ |
| 70 'googletest', | 70 'googletest/googletest', |
| 71 'googletest/include' | 71 'googletest/googletest/include' |
| 72 ], | 72 ], |
| 73 'direct_dependent_settings': { | 73 'direct_dependent_settings': { |
| 74 'include_dirs': [ | 74 'include_dirs': [ |
| 75 'googletest', | 75 'googletest/googletest', |
| 76 'googletest/include' | 76 'googletest/googletest/include' |
| 77 ] | 77 ] |
| 78 }, | 78 }, |
| 79 'conditions': [[ | 79 'conditions': [[ |
| 80 'OS=="win"', | 80 'OS=="win"', |
| 81 { | 81 { |
| 82 'defines': [ '_VARIADIC_MAX=10' ], | 82 'defines': [ '_VARIADIC_MAX=10' ], |
| 83 'direct_dependent_settings': { | 83 'direct_dependent_settings': { |
| 84 'defines': [ '_VARIADIC_MAX=10' ], | 84 'defines': [ '_VARIADIC_MAX=10' ], |
| 85 }, | 85 }, |
| 86 }]], | 86 }]], |
| 87 }, | 87 }, |
| 88 { | 88 { |
| 89 'target_name': 'googletest_main', | 89 'target_name': 'googletest_main', |
| 90 'type': '<(library)', | 90 'type': '<(library)', |
| 91 'sources': ['googletest/src/gtest_main.cc'], | 91 'sources': ['googletest/googletest/src/gtest_main.cc'], |
| 92 'dependencies': ['googletest'], | 92 'dependencies': ['googletest'], |
| 93 'export_dependent_settings': ['googletest'] | 93 'export_dependent_settings': ['googletest'] |
| 94 }] | 94 }] |
| 95 } | 95 } |
| OLD | NEW |
« no previous file with comments
|
« dependencies ('k')
|
no next file »
|
no next file with comments »
