diff options
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | meson/suppressions/meson.build | 6 | ||||
| m--------- | subprojects/zix | 0 | ||||
| -rw-r--r-- | subprojects/zix.wrap | 8 | ||||
| -rw-r--r-- | test/meson.build | 4 |
7 files changed, 32 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c4cd015..19937395 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ static: stage: build image: lv2plugin/debian-x64 script: - - meson setup build -Ddefault_library=static -Ddocs=disabled -Dexess:default_library=static -Dstatic=true -Dwarning_level=3 -Dwerror=true + - meson setup build -Ddefault_library=static -Ddocs=disabled -Dexess:default_library=static -Dstatic=true -Dwarning_level=3 -Dwerror=true -Dzix:default_library=static - ninja -C build test sanitize: @@ -99,7 +99,7 @@ mingw32: - meson configure -Dbuildtype=release build - ninja -C build test variables: - WINEPATH: "Z:\\usr\\lib\\gcc\\i686-w64-mingw32\\10-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess" + WINEPATH: "Z:\\usr\\lib\\gcc\\i686-w64-mingw32\\10-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess;Z:\\builds\\drobilla\\serd\\build\\subprojects\\zix" mingw64: stage: build @@ -110,7 +110,7 @@ mingw64: - meson configure -Dbuildtype=release build - ninja -C build test variables: - WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess" + WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\8.3-win32;Z:\\builds\\drobilla\\serd\\build\\subprojects\\exess;Z:\\builds\\drobilla\\serd\\build\\subprojects\\zix" # Non-Linux/Docker rows (not hosted) diff --git a/.gitmodules b/.gitmodules index c7cd26e0..8e0fee91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,7 @@ [submodule "subprojects/exess"] path = subprojects/exess url = ../exess.git + +[submodule "subprojects/zix"] + path = subprojects/zix + url = ../zix.git diff --git a/meson.build b/meson.build index 2afe226b..bfedbd54 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,7 @@ project( 'buildtype=release', 'c_std=c99', 'c_winlibs=[]', + 'cpp_std=c++17', 'warning_level=3', ], license: 'ISC', @@ -112,6 +113,12 @@ exess_dep = dependency( version: '>= 0.0.1', ) +zix_dep = dependency( + 'zix-0', + fallback: ['zix', 'zix_dep'], + version: '>= 0.3.3', +) + ########### # Library # ########### @@ -178,7 +185,7 @@ libserd = library( '-DSERD_MINOR_VERSION=@0@'.format(serd_minor_version), '-DSERD_VERSION="@0@"'.format(meson.project_version()), ] + c_suppressions + extra_c_args + platform_c_args, - dependencies: [exess_dep, m_dep], + dependencies: [exess_dep, m_dep, zix_dep], gnu_symbol_visibility: 'hidden', include_directories: include_dirs, install: true, diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index 88eb9f99..8bb9a27f 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -66,6 +66,12 @@ if is_variable('cc') endif endif + if warning_level in ['everything', '3'] + c_suppressions += [ + '-Wno-pedantic', # C11 + ] + endif + elif cc.get_id() == 'msvc' c_suppressions += [ '/experimental:external', diff --git a/subprojects/zix b/subprojects/zix new file mode 160000 +Subproject 08954c900820320064d2e33445858e1ef5024a0 diff --git a/subprojects/zix.wrap b/subprojects/zix.wrap new file mode 100644 index 00000000..ad883c92 --- /dev/null +++ b/subprojects/zix.wrap @@ -0,0 +1,8 @@ +# Copyright 2021 David Robillard <d@drobilla.net> +# SPDX-License-Identifier: 0BSD OR ISC + +[wrap-git] +url = https://gitlab.com/drobilla/zix.git +push-url = git@gitlab.com:drobilla/zix.git +revision = main +depth = 1 diff --git a/test/meson.build b/test/meson.build index fbfb9380..427d39dd 100644 --- a/test/meson.build +++ b/test/meson.build @@ -141,7 +141,9 @@ unit_tests = [ test_env = [] if build_machine.system() == 'windows' and host_machine.system() == 'windows' # For Windows, we need to add to PATH so that DLLs are found - test_env = ['PATH=@0@;@1@'.format('subprojects' / 'exess')] + test_env = [ + 'PATH=@0@;@1@'.format('subprojects' / 'exess', 'subprojects' / 'zix'), + ] endif foreach unit : unit_tests |