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

Side by Side Diff: gyp/jsoncpp.gyp

Issue 12963002: Refactor skia_warnings_as_errors (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Use variable instead of disable_warnings_as_errors.gypi Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # TODO: This file was copied from the external dependency 5 # TODO: This file was copied from the external dependency
6 # third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399, 6 # third_party/externals/jsoncpp-chromium/jsoncpp.gyp , at revision 125399,
7 # with directory paths modified to work at this level. 7 # with directory paths modified to work at this level.
8 # 8 #
9 # It would be better for us to depend on that gypfile within the external 9 # It would be better for us to depend on that gypfile within the external
10 # dependency, but so far we have been unable to make that work reliably. 10 # dependency, but so far we have been unable to make that work reliably.
11 # See https://code.google.com/p/skia/issues/detail?id=1023 11 # See https://code.google.com/p/skia/issues/detail?id=1023
12 # and https://code.google.com/p/skia/source/detail?r=7115 12 # and https://code.google.com/p/skia/source/detail?r=7115
13 13
14 { 14 {
15 'variables': {
16 'skia_warnings_as_errors': 0,
17 },
15 'targets': [ 18 'targets': [
16 { 19 {
17 'target_name': 'jsoncpp', 20 'target_name': 'jsoncpp',
18 'type': 'static_library', 21 'type': 'static_library',
19 'defines': [ 22 'defines': [
20 'JSON_USE_EXCEPTION=0', 23 'JSON_USE_EXCEPTION=0',
21 ], 24 ],
22 'sources': [ 25 'sources': [
23 '../third_party/externals/jsoncpp/include/json/assertions.h', 26 '../third_party/externals/jsoncpp/include/json/assertions.h',
24 '../third_party/externals/jsoncpp/include/json/autolink.h', 27 '../third_party/externals/jsoncpp/include/json/autolink.h',
(...skipping 15 matching lines...) Expand all
40 '../third_party/externals/jsoncpp/include/', 43 '../third_party/externals/jsoncpp/include/',
41 '../third_party/externals/jsoncpp/src/lib_json/', 44 '../third_party/externals/jsoncpp/src/lib_json/',
42 ], 45 ],
43 'direct_dependent_settings': { 46 'direct_dependent_settings': {
44 'include_dirs': [ 47 'include_dirs': [
45 '../third_party/externals/jsoncpp-chromium/overrides/include/', 48 '../third_party/externals/jsoncpp-chromium/overrides/include/',
46 '../third_party/externals/jsoncpp/include/', 49 '../third_party/externals/jsoncpp/include/',
47 ], 50 ],
48 }, 51 },
49 'conditions': [ 52 'conditions': [
50 [ 'skia_os == "mac"', {
51 'xcode_settings': {
52 'OTHER_CPLUSPLUSFLAGS!': [
53 '-Werror',
54 ]
55 },
56 }],
57 [ 'skia_os == "win"', {
58 'msvs_settings': {
59 'VCCLCompilerTool': {
60 'WarnAsError': 'false',
61 },
62 },
63 }],
64 [ 'skia_os == "android"', { 53 [ 'skia_os == "android"', {
65 'cflags!': [ 54 'cflags!': [
66 '-Wall', 55 '-Wall',
67 '-Werror',
68 ],
69 }],
70 ['skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl"]', {
71 'cflags!': [
72 '-Werror',
73 ], 56 ],
74 }], 57 }],
75 ], 58 ],
76 }, 59 },
77 ], 60 ],
78 } 61 }
79 62
80 # Local Variables: 63 # Local Variables:
81 # tab-width:2 64 # tab-width:2
82 # indent-tabs-mode:nil 65 # indent-tabs-mode:nil
83 # End: 66 # End:
84 # vim: set expandtab tabstop=2 shiftwidth=2: 67 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« gyp/cityhash.gyp ('K') | « gyp/common_variables.gypi ('k') | gyp/libjpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698