Unified 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.
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 »
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 |
| deleted file mode 100644 |
| index d8c94f86f46fe57e91090c0814e53f87e80e5e44..0000000000000000000000000000000000000000 |
| --- a/third_party/googletest.gyp |
| +++ /dev/null |
| @@ -1,95 +0,0 @@ |
| -{ |
| - 'target_defaults': { |
| - 'configurations': { |
| - 'Debug': { |
| - 'defines': [ 'DEBUG' ], |
| - 'msvs_settings': { |
| - 'VCCLCompilerTool': { |
| - 'Optimization': '0', |
| - |
| - 'conditions': [ |
| - ['OS=="win" and component=="shared_library"', { |
| - 'RuntimeLibrary': '3', # /MDd |
| - }, { |
| - 'RuntimeLibrary': '1', # /MTd |
| - }] |
| - ], |
| - }, |
| - }, |
| - }, |
| - 'Release': { |
| - 'msvs_settings': { |
| - 'VCCLCompilerTool': { |
| - 'Optimization': '2', |
| - 'InlineFunctionExpansion': '2', |
| - 'EnableIntrinsicFunctions': 'true', |
| - 'FavorSizeOrSpeed': '0', |
| - 'StringPooling': 'true', |
| - |
| - 'conditions': [ |
| - ['OS=="win" and component=="shared_library"', { |
| - 'RuntimeLibrary': '2', # /MD |
| - }, { |
| - 'RuntimeLibrary': '0', # /MT |
| - }] |
| - ], |
| - }, |
| - }, |
| - }, |
| - }, |
| - 'msvs_configuration_attributes': { |
| - 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', |
| - 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| - }, |
| - 'conditions': [[ |
| - 'target_arch=="x64"', { |
| - 'xcode_settings': { |
| - 'ARCHS': [ 'x86_64' ], |
| - }, |
| - 'msvs_configuration_platform': 'x64', |
| - }, { |
| - 'xcode_settings': { |
| - 'ARCHS': [ 'i386' ], |
| - }, |
| - }, |
| - ]] |
| - }, |
| - 'targets': [{ |
| - 'target_name': 'googletest', |
| - 'type': '<(library)', |
| - 'sources': [ |
| - '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', |
| - 'googletest/googletest/include' |
| - ], |
| - 'direct_dependent_settings': { |
| - 'include_dirs': [ |
| - 'googletest/googletest', |
| - 'googletest/googletest/include' |
| - ] |
| - }, |
| - 'conditions': [[ |
| - 'OS=="win"', |
| - { |
| - 'defines': [ '_VARIADIC_MAX=10' ], |
| - 'direct_dependent_settings': { |
| - 'defines': [ '_VARIADIC_MAX=10' ], |
| - }, |
| - }]], |
| - }, |
| - { |
| - 'target_name': 'googletest_main', |
| - 'type': '<(library)', |
| - 'sources': ['googletest/googletest/src/gtest_main.cc'], |
| - 'dependencies': ['googletest'], |
| - 'export_dependent_settings': ['googletest'] |
| - }] |
| -} |
« googletest.gyp ('K')
|
« src/WebRequestJsObject.cpp ('k')
|
v8.gypi » ('j')
|
no next file with comments »
