From ab07fd8a99b3199bf4aff52b32432e4fd24f7b3a Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 16 Apr 2021 10:47:50 +0200 Subject: Meson: Update and fix MsgPack/ZMQ dependencies --- libcrystfel/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libcrystfel') diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 10c66ace..09640f9d 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -37,6 +37,12 @@ if ccp4dep.found() conf_data.set10('HAVE_LIBCCP4', 1) endif +msgpackdep = dependency('msgpack', required : false) +if msgpackdep.found() + conf_data.set10('HAVE_MSGPACK', 1) +endif + + libcrystfel_versionc = vcs_tag(input: 'src/libcrystfel-version.c.in', output: 'libcrystfel-version.c') @@ -129,7 +135,7 @@ libcrystfel = library('crystfel', [libcrystfel_sources, libcrystfel_versionc], dependencies : [mdep, utildep, fftwdep, gsldep, zlibdep, hdf5dep, pthreaddep, ncursesdep, xgandalfdep, pinkindexerdep, fdipdep, - ccp4dep], + ccp4dep, msgpackdep], install : true) libcrystfeldep = declare_dependency(include_directories : libcrystfel_includes, -- cgit v1.2.3