Unified Diff: 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: independence from file mode of make_gyp_wrapper.py
Created July 4, 2017, 11:11 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« dependencies ('k')
|
include/AdblockPlus/JsEngine.h » ('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: googletest.gyp |
| diff --git a/third_party/googletest.gyp b/googletest.gyp |
| similarity index 63% |
| rename from third_party/googletest.gyp |
| rename to googletest.gyp |
| index d8c94f86f46fe57e91090c0814e53f87e80e5e44..46470fb9fc01eb52adc990cd7324bd8edeb30938 100644 |
| --- a/third_party/googletest.gyp |
| +++ b/googletest.gyp |
| @@ -6,7 +6,6 @@ |
| 'msvs_settings': { |
| 'VCCLCompilerTool': { |
| 'Optimization': '0', |
| - |
| 'conditions': [ |
| ['OS=="win" and component=="shared_library"', { |
| 'RuntimeLibrary': '3', # /MDd |
| @@ -37,10 +36,6 @@ |
| }, |
| }, |
| }, |
| - 'msvs_configuration_attributes': { |
| - 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', |
| - 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', |
| - }, |
| 'conditions': [[ |
| 'target_arch=="x64"', { |
| 'xcode_settings': { |
| @@ -58,37 +53,29 @@ |
| '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' |
| + 'third_party/googletest/googletest/src/gtest-death-test.cc', |
| + 'third_party/googletest/googletest/src/gtest-filepath.cc', |
| + 'third_party/googletest/googletest/src/gtest-port.cc', |
| + 'third_party/googletest/googletest/src/gtest-printers.cc', |
| + 'third_party/googletest/googletest/src/gtest-test-part.cc', |
| + 'third_party/googletest/googletest/src/gtest-typed-test.cc', |
| + 'third_party/googletest/googletest/src/gtest.cc' |
| ], |
| 'include_dirs': [ |
| - 'googletest/googletest', |
| - 'googletest/googletest/include' |
| + 'third_party/googletest/googletest', |
| + 'third_party/googletest/googletest/include' |
| ], |
| 'direct_dependent_settings': { |
| 'include_dirs': [ |
| - 'googletest/googletest', |
| - 'googletest/googletest/include' |
| + 'third_party/googletest/googletest', |
| + 'third_party/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'], |
| + 'sources': ['third_party/googletest/googletest/src/gtest_main.cc'], |
| 'dependencies': ['googletest'], |
| 'export_dependent_settings': ['googletest'] |
| }] |
« no previous file with comments
|
« dependencies ('k')
|
include/AdblockPlus/JsEngine.h » ('j')
|
no next file with comments »
