diff options
| author | kjellander <kjellander@webrtc.org> | 2015-12-16 14:05:29 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-16 22:05:36 +0000 |
| commit | 7cae30cbe1200854bbe26205ab53d0f418c8d443 (patch) | |
| tree | 7534623814054be7d6b03123d50d59c42188bfc9 /webrtc/modules | |
| parent | 9f58795cec513b01788ee7c22198d84f361dc349 (diff) | |
| download | webrtc-7cae30cbe1200854bbe26205ab53d0f418c8d443.tar.gz | |
Disable warnings failing when using Clang on Windows.
This makes it possible to build WebRTC using Clang on Windows.
Depends on https://codereview.webrtc.org/1524703006/
BUG=webrtc:5360, webrtc:5366
NOTRY=True
Review URL: https://codereview.webrtc.org/1522223002
Cr-Commit-Position: refs/heads/master@{#11058}
Diffstat (limited to 'webrtc/modules')
| -rw-r--r-- | webrtc/modules/audio_coding/codecs/isac/isac_test.gypi | 14 | ||||
| -rw-r--r-- | webrtc/modules/audio_device/audio_device.gypi | 25 | ||||
| -rw-r--r-- | webrtc/modules/video_capture/video_capture.gypi | 17 | ||||
| -rw-r--r-- | webrtc/modules/video_render/video_render.gypi | 14 |
4 files changed, 67 insertions, 3 deletions
diff --git a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi index 47944b7f42..54cedb4e18 100644 --- a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi @@ -25,6 +25,19 @@ './main/test/simpleKenny.c', './main/util/utility.c', ], + 'conditions': [ + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-format', + ], + }, + }, + }], + ], # conditions. }, # ReleaseTest-API { @@ -63,6 +76,5 @@ './main/util/utility.c', ], }, - ], } diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi index 480276836b..41456a80ae 100644 --- a/webrtc/modules/audio_device/audio_device.gypi +++ b/webrtc/modules/audio_device/audio_device.gypi @@ -194,6 +194,27 @@ ], }, }], + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-bool-conversion', + '-Wno-delete-non-virtual-dtor', + '-Wno-logical-op-parentheses', + '-Wno-microsoft-extra-qualification', + '-Wno-microsoft-goto', + '-Wno-missing-braces', + '-Wno-parentheses-equality', + '-Wno-reorder', + '-Wno-shift-overflow', + '-Wno-tautological-compare', + '-Wno-unused-private-field', + ], + }, + }, + }], ], # conditions }], # include_internal_audio_device==1 ], # conditions @@ -205,8 +226,8 @@ 'targets': [ { 'target_name': 'audio_device_tests', - 'type': 'executable', - 'dependencies': [ + 'type': 'executable', + 'dependencies': [ 'audio_device', 'webrtc_utility', '<(webrtc_root)/test/test.gyp:test_support_main', diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index 3ab9b4026f..c80f2bf5b5 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -116,6 +116,23 @@ ], }, }], # win + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-comment', + '-Wno-ignored-attributes', + '-Wno-microsoft-extra-qualification', + '-Wno-missing-braces', + '-Wno-overloaded-virtual', + '-Wno-reorder', + '-Wno-writable-strings', + ], + }, + }, + }], ['OS=="ios"', { 'sources': [ 'ios/device_info_ios.h', diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 5ec32b70b9..e8cc03a4b0 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -149,6 +149,20 @@ '<(directx_sdk_path)/Include', ], }], + ['OS=="win" and clang==1', { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ + # Disable warnings failing when compiling with Clang on Windows. + # https://bugs.chromium.org/p/webrtc/issues/detail?id=5366 + '-Wno-comment', + '-Wno-reorder', + '-Wno-unused-value', + '-Wno-unused-private-field', + ], + }, + }, + }], ] # conditions }, ], |