Side by Side Diff: third_party/googletest.gyp
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: rebase
Created Aug. 5, 2015, 10:38 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« test/BaseJsTest.h ('K')
|
« test/UpdateCheck.cpp ('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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 'googletest/include' | 76 '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 }, { | |
| 87 'defines': [ 'GTEST_HAS_TR1_TUPLE=1', 'GTEST_USE_OWN_TR1_TUPLE=0' ], | |
| 88 'direct_dependent_settings': { | |
| 89 'defines': [ 'GTEST_HAS_TR1_TUPLE=1', 'GTEST_USE_OWN_TR1_TUPLE=0' ], | |
| 90 }, | |
| 91 }]], | 86 }]], |
| 92 }, | 87 }, |
| 93 { | 88 { |
| 94 'target_name': 'googletest_main', | 89 'target_name': 'googletest_main', |
| 95 'type': '<(library)', | 90 'type': '<(library)', |
| 96 'sources': ['googletest/src/gtest_main.cc'], | 91 'sources': ['googletest/src/gtest_main.cc'], |
| 97 'dependencies': ['googletest'], | 92 'dependencies': ['googletest'], |
| 98 'export_dependent_settings': ['googletest'] | 93 'export_dependent_settings': ['googletest'] |
| 99 }] | 94 }] |
| 100 } | 95 } |
| OLD | NEW |
« test/BaseJsTest.h ('K')
|
« test/UpdateCheck.cpp ('k')
|
no next file »
|
no next file with comments »
