diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2021-07-12 23:20:31 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2021-07-13 15:45:48 +0100 |
| commit | e4f87fb5f2a8c212119ab867b9afdcf3ee781482 (patch) | |
| tree | 32f01a49b7c877ffdb5068eef7287fd946e7a7e1 | |
| parent | 533d0a05705112c46a6a01a5c0e0b5b4b85fca36 (diff) | |
| download | waffle-e4f87fb5f2a8c212119ab867b9afdcf3ee781482.tar.gz | |
waffle: consistently set WAFFLE_API_VERSION
Consistently set the define across the project. With that done, we can
enable -Werror=vla
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
| -rw-r--r-- | meson.build | 13 | ||||
| -rw-r--r-- | src/waffle/meson.build | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/meson.build b/meson.build index b7b7456..acdfc20 100644 --- a/meson.build +++ b/meson.build @@ -213,6 +213,7 @@ if cc.get_argument_syntax() == 'gcc' '-Werror=incompatible-pointer-types', '-Werror=int-conversion', '-Werror=missing-prototypes', # TODO: breaks on MacOS? + '-Werror=undef', ]), language : ['c', 'cpp'], ) @@ -222,6 +223,10 @@ if cc.get_argument_syntax() == 'gcc' add_project_link_arguments('-static-libgcc', language : ['c', 'cpp']) endif endif + api_c_args = [ + '-DWAFFLE_API_VERSION=@0@'.format('0x0108'), + '-DWAFFLE_API_EXPERIMENTAL', + ] elif cc.get_argument_syntax() == 'msvc' add_project_arguments( '/D_win32_WINNT=0x0601', @@ -230,6 +235,10 @@ elif cc.get_argument_syntax() == 'msvc' '/D_CRT_SECURE_NO_WARNINGS', language : ['c'], ) + api_c_args = [ + '/DWAFFLE_API_VERSION=@0@'.format('0x0108'), + '/DWAFFLE_API_EXPERIMENTAL', + ] endif if build_nacl @@ -239,10 +248,6 @@ endif install_data('README.md', 'LICENSE.txt', 'HACKING.txt', install_dir : docdir) install_subdir('doc/release-notes', install_dir : docdir) -api_c_args = [ - '-DWAFFLE_API_VERSION=@0@'.format('0x0108'), - '-DWAFFLE_API_EXPERIMENTAL', -] if get_option('build-tests') dep_cmocka = dependency('cmocka', fallback : ['cmocka', 'dep_cmocka']) diff --git a/src/waffle/meson.build b/src/waffle/meson.build index 01898c8..02de934 100644 --- a/src/waffle/meson.build +++ b/src/waffle/meson.build @@ -278,8 +278,10 @@ if get_option('build-tests') executable( '@0@_unittest'.format(t), 'core/@0@_unittest.c'.format(t), - dependencies : [dep_cmocka, idep_threads], include_directories : [inc_waffle, inc_include], + c_args : api_c_args, + cpp_args : api_c_args, + dependencies : [dep_cmocka, idep_threads], link_with : testwaffle, ), suite : ['core'], |