| OLD | NEW |
| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 # Define an "os_include" variable that points at the OS-specific generated | 8 # Define an "os_include" variable that points at the OS-specific generated |
| 9 # headers. These were generated by running the configure script offline. | 9 # headers. These were generated by running the configure script offline. |
| 10 ['os_posix == 1 and OS != "mac"', { | 10 ['os_posix == 1 and OS != "mac"', { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 'sources': [ | 33 'sources': [ |
| 34 'src/snappy-internal.h', | 34 'src/snappy-internal.h', |
| 35 'src/snappy-sinksource.cc', | 35 'src/snappy-sinksource.cc', |
| 36 'src/snappy-sinksource.h', | 36 'src/snappy-sinksource.h', |
| 37 'src/snappy-stubs-internal.cc', | 37 'src/snappy-stubs-internal.cc', |
| 38 'src/snappy-stubs-internal.h', | 38 'src/snappy-stubs-internal.h', |
| 39 'src/snappy.cc', | 39 'src/snappy.cc', |
| 40 'src/snappy.h', | 40 'src/snappy.h', |
| 41 ], | 41 ], |
| 42 'conditions': [ | 42 'conditions': [ |
| 43 ['clang == 1', { |
| 44 # snappy-stubs-internal.h unapologetically has: using namespace std |
| 45 # https://code.google.com/p/snappy/issues/detail?id=70 |
| 46 'xcode_settings': { |
| 47 'WARNING_CFLAGS!': [ '-Wheader-hygiene' ], |
| 48 }, |
| 49 'cflags': [ '-Wno-header-hygiene' ], |
| 50 }], |
| 51 ['OS=="linux"', { |
| 52 'defines': [ |
| 53 # TODO(tfarina): Only Linux has the generated config.h for now. |
| 54 # Generate the config.h in the other platforms: mac, win and enable |
| 55 # this for everyone. |
| 56 'HAVE_CONFIG_H=1', |
| 57 ], |
| 58 }], |
| 43 ['OS=="win"', { | 59 ['OS=="win"', { |
| 44 # Signed/unsigned comparison | 60 # Signed/unsigned comparison |
| 45 'msvs_disabled_warnings': [ | 61 'msvs_disabled_warnings': [ |
| 46 # https://code.google.com/p/snappy/issues/detail?id=71 | 62 # https://code.google.com/p/snappy/issues/detail?id=71 |
| 47 4018, | 63 4018, |
| 48 # https://code.google.com/p/snappy/issues/detail?id=75 | 64 # https://code.google.com/p/snappy/issues/detail?id=75 |
| 49 4267, | 65 4267, |
| 50 ], | 66 ], |
| 51 }], | 67 }], |
| 52 ['clang == 1', { | |
| 53 # snappy-stubs-internal.h unapologetically has: using namespace std | |
| 54 # https://code.google.com/p/snappy/issues/detail?id=70 | |
| 55 'xcode_settings': { | |
| 56 'WARNING_CFLAGS!': [ '-Wheader-hygiene' ], | |
| 57 }, | |
| 58 'cflags!': [ '-Wheader-hygiene' ], | |
| 59 }], | |
| 60 ], | 68 ], |
| 61 }, | 69 }, |
| 62 { | 70 { |
| 63 'target_name': 'snappy_unittest', | 71 'target_name': 'snappy_unittest', |
| 64 'type': 'executable', | 72 'type': 'executable', |
| 73 'defines': [ |
| 74 'HAVE_CONFIG_H=1', |
| 75 ], |
| 65 'sources': [ | 76 'sources': [ |
| 66 'src/snappy-test.cc', | 77 'src/snappy-test.cc', |
| 67 'src/snappy-test.h', | 78 'src/snappy-test.h', |
| 68 'src/snappy_unittest.cc', | 79 'src/snappy_unittest.cc', |
| 69 ], | 80 ], |
| 70 'dependencies': [ | 81 'dependencies': [ |
| 71 'snappy', | 82 'snappy', |
| 72 '../../base/base.gyp:base', | 83 '../../base/base.gyp:base', |
| 73 '../../testing/gtest.gyp:gtest', | 84 '../../testing/gtest.gyp:gtest', |
| 74 '../../third_party/zlib/zlib.gyp:zlib', | 85 '../../third_party/zlib/zlib.gyp:zlib', |
| 75 ], | 86 ], |
| 87 'conditions': [ |
| 88 ['clang == 1', { |
| 89 'cflags': [ |
| 90 '-Wno-return-type', |
| 91 '-Wno-header-hygiene' |
| 92 ], |
| 93 }], |
| 94 ], |
| 76 }, | 95 }, |
| 77 ], | 96 ], |
| 78 } | 97 } |
| OLD | NEW |