Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: third_party/gflags/gflags.gyp

Issue 1679263002: Switch third_party/gflags to use updated GitHub repo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add myself to owners Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2011 Google Inc. 1 # Copyright 2011 Google Inc.
2 # 2 #
3 # Licensed under the Apache License, Version 2.0 (the "License"); 3 # Licensed under the Apache License, Version 2.0 (the "License");
4 # you may not use this file except in compliance with the License. 4 # you may not use this file except in compliance with the License.
5 # You may obtain a copy of the License at 5 # You may obtain a copy of the License at
6 # 6 #
7 # http://www.apache.org/licenses/LICENSE-2.0 7 # http://www.apache.org/licenses/LICENSE-2.0
8 # 8 #
9 # Unless required by applicable law or agreed to in writing, software 9 # Unless required by applicable law or agreed to in writing, software
10 # distributed under the License is distributed on an "AS IS" BASIS, 10 # distributed under the License is distributed on an "AS IS" BASIS,
(...skipping 10 matching lines...) Expand all
21 }, { 21 }, {
22 'gflags_gen_arch_root': '<(gflags_root)/gen/posix', 22 'gflags_gen_arch_root': '<(gflags_root)/gen/posix',
23 }], 23 }],
24 ], 24 ],
25 }, 25 },
26 'targets': [ 26 'targets': [
27 { 27 {
28 'target_name': 'gflags', 28 'target_name': 'gflags',
29 'type': 'static_library', 29 'type': 'static_library',
30 'include_dirs': [ 30 'include_dirs': [
31 '<(gflags_gen_arch_root)/include/gflags', # For configured files.
31 '<(gflags_gen_arch_root)/include/private', # For config.h 32 '<(gflags_gen_arch_root)/include/private', # For config.h
32 '<(gflags_gen_arch_root)/include', # For configured files. 33 '<(gflags_root)/src/src', # For everything else.
33 '<(gflags_root)/src', # For everything else.
34 ], 34 ],
35 'defines': [ 35 'defines': [
36 # These macros exist so flags and symbols are properly 36 # These macros exist so flags and symbols are properly
37 # exported when building DLLs. Since we don't build DLLs, we 37 # exported when building DLLs. Since we don't build DLLs, we
38 # need to disable them. 38 # need to disable them.
39 'GFLAGS_DLL_DECL=', 39 'GFLAGS_DLL_DECL=',
40 'GFLAGS_DLL_DECLARE_FLAG=', 40 'GFLAGS_DLL_DECLARE_FLAG=',
41 'GFLAGS_DLL_DEFINE_FLAG=', 41 'GFLAGS_DLL_DEFINE_FLAG=',
42 ], 42 ],
43 'direct_dependent_settings': { 43 'direct_dependent_settings': {
44 'include_dirs': [ 44 'include_dirs': [
45 '<(gflags_gen_arch_root)/include', # For configured files. 45 '<(gflags_gen_arch_root)/include', # For configured files.
46 '<(gflags_root)/src', # For everything else. 46 '<(gflags_root)/src/src', # For everything else.
47 ], 47 ],
48 'defines': [ 48 'defines': [
49 'GFLAGS_DLL_DECL=', 49 'GFLAGS_DLL_DECL=',
50 'GFLAGS_DLL_DECLARE_FLAG=', 50 'GFLAGS_DLL_DECLARE_FLAG=',
51 'GFLAGS_DLL_DEFINE_FLAG=', 51 'GFLAGS_DLL_DEFINE_FLAG=',
52 ], 52 ],
53 }, 53 },
54 'sources': [ 54 'sources': [
55 'src/gflags.cc', 55 'src/src/gflags.cc',
56 'src/gflags_completions.cc', 56 'src/src/gflags_completions.cc',
57 'src/gflags_reporting.cc', 57 'src/src/gflags_reporting.cc',
58 ], 58 ],
59 'conditions': [ 59 'conditions': [
60 ['OS=="win"', { 60 ['OS=="win"', {
61 'sources': [ 61 'sources': [
62 'src/windows/port.cc', 62 'src/src/windows_port.cc',
63 ], 63 ],
64 # Suppress warnings about WIN32_LEAN_AND_MEAN and size_t truncation. 64 'msvs_disabled_warnings': [
65 'msvs_disabled_warnings': [4005, 4267], 65 4005, # WIN32_LEAN_AND_MEAN redefinition.
66 4267, # Conversion from size_t to "type".
67 ],
68 'configurations': {
69 'Common_Base': {
70 'msvs_configuration_attributes': {
71 'CharacterSet': '2', # Use Multi-byte Character Set.
72 },
73 },
74 },
66 }], 75 }],
67 # TODO(andrew): Look into fixing this warning upstream: 76 # TODO(andrew): Look into fixing this warning upstream:
68 # http://code.google.com/p/webrtc/issues/detail?id=760 77 # http://code.google.com/p/webrtc/issues/detail?id=760
69 ['OS=="win" and clang==1', { 78 ['OS=="win" and clang==1', {
70 'msvs_settings': { 79 'msvs_settings': {
71 'VCCLCompilerTool': { 80 'VCCLCompilerTool': {
72 'AdditionalOptions!': [
73 '-Wheader-hygiene', # Suppress warning about using namespace.
74 ],
75 'AdditionalOptions': [ 81 'AdditionalOptions': [
76 '-Wno-unused-local-typedef', # Suppress unused private typedef. 82 '-Wno-microsoft-include',
77 ], 83 ],
78 }, 84 },
79 }, 85 },
80 }], 86 }],
81 ['clang==1', { 87 ['clang==1', {
82 'cflags': ['-Wno-unused-local-typedef',], 88 'cflags': [
83 'cflags!': ['-Wheader-hygiene',], 89 '-Wno-microsoft-include',
84 'xcode_settings': { 90 ],
85 'WARNING_CFLAGS': ['-Wno-unused-local-typedef',],
86 'WARNING_CFLAGS!': ['-Wheader-hygiene',],
87 },
88 }], 91 }],
89 ], 92 ],
90 }, 93 },
91 ], 94 ],
92 } 95 }
OLDNEW
« no previous file with comments | « third_party/gflags/gen/win/include/private/config.h ('k') | webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698