diff options
Diffstat (limited to 'bindings/cpp/meson.build')
| -rw-r--r-- | bindings/cpp/meson.build | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/bindings/cpp/meson.build b/bindings/cpp/meson.build index 627e537c..b9b2869c 100644 --- a/bindings/cpp/meson.build +++ b/bindings/cpp/meson.build @@ -1,19 +1,17 @@ versioned_cpp_name = 'serdxx' + version_suffix -cpp_prog_args = [] - # Set ultra strict warnings for developers, if requested +cpp_suppressions = [] if get_option('strict') - cpp_warnings = all_cpp_warnings if cpp.get_id() == 'clang' - cpp_warnings += [ + cpp_suppressions += [ '-Wno-documentation-unknown-command', '-Wno-format-nonliteral', '-Wno-nullability-extension', '-Wno-padded', ] elif cpp.get_id() == 'gcc' - cpp_warnings += [ + cpp_suppressions += [ '-Wno-abi-tag', '-Wno-float-equal', '-Wno-inline', @@ -24,7 +22,7 @@ if get_option('strict') '-Wno-unused-const-variable', ] elif cpp.get_id() == 'msvc' - cpp_warnings += [ + cpp_suppressions += [ '/wd4355', # 'this' used in base member initializer list '/wd4571', # structured exceptions are no longer caught '/wd4623', # default constructor implicitly deleted @@ -36,11 +34,10 @@ if get_option('strict') '/wd5027', # move assignment operator implicitly deleted ] endif - - cpp_prog_args = cpp.get_supported_arguments(cpp_warnings) - endif +exess_cpp_args = cpp.get_supported_arguments(cpp_suppressions) + cpp_headers = [ 'include/serd/serd.hpp', 'include/serd/detail/Copyable.hpp', @@ -70,6 +67,6 @@ test('bindings', executable('test_serd_hpp', 'test/test_serd_hpp.cpp', include_directories: include_directories(['include']), - cpp_args: cpp_prog_args + cpp_test_args, + cpp_args: exess_cpp_args + cpp_test_args, dependencies: [serd_dep, serdxx_dep]), suite: 'cpp') |