Side by Side Diff: third_party/googletest.gyp
Issue 29451722:
Issue 4907 - Update v8 to 5.7.278 in libadblockplus (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: address MSVS2017 and fix googletest
Created June 14, 2017, 3:36 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« googletest.gyp ('K')
|
« src/WebRequestJsObject.cpp ('k')
|
v8.gypi » ('j')
|
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 |
|---|---|
| (Empty) | |
| 1 { | |
| 2 'target_defaults': { | |
| 3 'configurations': { | |
| 4 'Debug': { | |
| 5 'defines': [ 'DEBUG' ], | |
| 6 'msvs_settings': { | |
| 7 'VCCLCompilerTool': { | |
| 8 'Optimization': '0', | |
| 9 | |
| 10 'conditions': [ | |
| 11 ['OS=="win" and component=="shared_library"', { | |
| 12 'RuntimeLibrary': '3', # /MDd | |
| 13 }, { | |
| 14 'RuntimeLibrary': '1', # /MTd | |
| 15 }] | |
| 16 ], | |
| 17 }, | |
| 18 }, | |
| 19 }, | |
| 20 'Release': { | |
| 21 'msvs_settings': { | |
| 22 'VCCLCompilerTool': { | |
| 23 'Optimization': '2', | |
| 24 'InlineFunctionExpansion': '2', | |
| 25 'EnableIntrinsicFunctions': 'true', | |
| 26 'FavorSizeOrSpeed': '0', | |
| 27 'StringPooling': 'true', | |
| 28 | |
| 29 'conditions': [ | |
| 30 ['OS=="win" and component=="shared_library"', { | |
| 31 'RuntimeLibrary': '2', # /MD | |
| 32 }, { | |
| 33 'RuntimeLibrary': '0', # /MT | |
| 34 }] | |
| 35 ], | |
| 36 }, | |
| 37 }, | |
| 38 }, | |
| 39 }, | |
| 40 'msvs_configuration_attributes': { | |
| 41 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', | |
| 42 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | |
| 43 }, | |
| 44 'conditions': [[ | |
| 45 'target_arch=="x64"', { | |
| 46 'xcode_settings': { | |
| 47 'ARCHS': [ 'x86_64' ], | |
| 48 }, | |
| 49 'msvs_configuration_platform': 'x64', | |
| 50 }, { | |
| 51 'xcode_settings': { | |
| 52 'ARCHS': [ 'i386' ], | |
| 53 }, | |
| 54 }, | |
| 55 ]] | |
| 56 }, | |
| 57 'targets': [{ | |
| 58 'target_name': 'googletest', | |
| 59 'type': '<(library)', | |
| 60 'sources': [ | |
| 61 'googletest/googletest/src/gtest-death-test.cc', | |
| 62 'googletest/googletest/src/gtest-filepath.cc', | |
| 63 'googletest/googletest/src/gtest-port.cc', | |
| 64 'googletest/googletest/src/gtest-printers.cc', | |
| 65 'googletest/googletest/src/gtest-test-part.cc', | |
| 66 'googletest/googletest/src/gtest-typed-test.cc', | |
| 67 'googletest/googletest/src/gtest.cc' | |
| 68 ], | |
| 69 'include_dirs': [ | |
| 70 'googletest/googletest', | |
| 71 'googletest/googletest/include' | |
| 72 ], | |
| 73 'direct_dependent_settings': { | |
| 74 'include_dirs': [ | |
| 75 'googletest/googletest', | |
| 76 'googletest/googletest/include' | |
| 77 ] | |
| 78 }, | |
| 79 'conditions': [[ | |
| 80 'OS=="win"', | |
| 81 { | |
| 82 'defines': [ '_VARIADIC_MAX=10' ], | |
| 83 'direct_dependent_settings': { | |
| 84 'defines': [ '_VARIADIC_MAX=10' ], | |
| 85 }, | |
| 86 }]], | |
| 87 }, | |
| 88 { | |
| 89 'target_name': 'googletest_main', | |
| 90 'type': '<(library)', | |
| 91 'sources': ['googletest/googletest/src/gtest_main.cc'], | |
| 92 'dependencies': ['googletest'], | |
| 93 'export_dependent_settings': ['googletest'] | |
| 94 }] | |
| 95 } | |
| OLD | NEW |
« googletest.gyp ('K')
|
« src/WebRequestJsObject.cpp ('k')
|
v8.gypi » ('j')
|
no next file with comments »
