diff options
| author | David Robillard <d@drobilla.net> | 2023-02-05 01:55:00 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2023-02-05 01:55:00 -0500 |
| commit | 32a95bd5024623befa3ed445400075a6faae7522 (patch) | |
| tree | b2e495eed2ff454adabf6bcc37bafa25c088b93d | |
| parent | a6728f63b2e20e2dcfb56d338371d3ef1f3a7569 (diff) | |
| download | raul-32a95bd5024623befa3ed445400075a6faae7522.tar.gz raul-32a95bd5024623befa3ed445400075a6faae7522.tar.bz2 raul-32a95bd5024623befa3ed445400075a6faae7522.zip | |
Fix strict clang build on Windows
| -rw-r--r-- | meson/suppressions/meson.build | 12 | ||||
| -rw-r--r-- | test/meson.build | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index b134f3c..a92c808 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -16,14 +16,20 @@ if is_variable('cpp') if get_option('strict') if cpp.get_id() in ['clang', 'emscripten'] - cpp_suppressions = [ + cpp_suppressions += [ '-Wno-c++17-extensions', '-Wno-padded', '-Wno-weak-vtables', ] + if host_machine.system() == 'windows' + cpp_suppressions += [ + '-Wno-nonportable-system-include-path', + ] + endif + elif cpp.get_id() == 'gcc' - cpp_suppressions = [ + cpp_suppressions += [ '-Wno-abi-tag', '-Wno-inline', '-Wno-multiple-inheritance', @@ -34,7 +40,7 @@ if is_variable('cpp') ] elif cpp.get_id() == 'msvc' - cpp_suppressions = [ + cpp_suppressions += [ '/wd4514', # unreferenced inline function removed '/wd4625', # copy constructor implicitly deleted '/wd4626', # assignment operator implicitly deleted diff --git a/test/meson.build b/test/meson.build index 829a59c..0c073b8 100644 --- a/test/meson.build +++ b/test/meson.build @@ -36,6 +36,13 @@ if cpp.get_id() == 'clang' '-Wno-padded', '-Wno-weak-vtables', ] + + if host_machine.system() == 'windows' + header_args += [ + '-Wno-nonportable-system-include-path', + ] + endif + elif cpp.get_id() == 'gcc' header_args += [ '-Wno-abi-tag', @@ -44,6 +51,7 @@ elif cpp.get_id() == 'gcc' '-Wno-switch-default', '-Wno-useless-cast', ] + elif cpp.get_id() == 'msvc' header_args += [ '/wd4626', # assignment operator implicitly deleted |