Commit 33363f5c authored by Vladimír Čunát's avatar Vladimír Čunát

Merge !810: meson fixes

Closes #461 and #460.
parents 40cdcc0f db89aefc
......@@ -8,6 +8,13 @@ project(
)
# Unity build
if get_option('unity') != 'off'
error('unity builds are not supported! ' +
'https://gitlab.labs.nic.cz/knot/knot-resolver/issues/460')
endif
message('--- required dependencies ---')
knot_version = '>=2.8'
libknot = dependency('libknot', version: knot_version)
......
......@@ -28,7 +28,8 @@ if build_dnstap
command: [
protoc_c,
'--c_out=' + meson.current_build_dir(),
'--proto_path', meson.current_source_dir(), join_paths([meson.current_source_dir(), 'dnstap.proto']),
'--proto_path', meson.current_source_dir(),
join_paths([meson.current_source_dir(), 'dnstap.proto']),
],
output: [
'dnstap.pb-c.h',
......@@ -40,8 +41,8 @@ if build_dnstap
dnstap_mod = shared_module(
'dnstap',
dnstap_src,
dnstap_pb[1],
dependencies: [
declare_dependency(sources: dnstap_pb),
libfstrm,
libprotobuf_c,
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment