aboutsummaryrefslogtreecommitdiff
path: root/libcrystfel
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-04-16 10:47:50 +0200
committerThomas White <taw@physics.org>2021-04-16 10:47:50 +0200
commitab07fd8a99b3199bf4aff52b32432e4fd24f7b3a (patch)
tree1e62089bb7d168ca1e2041a5f535d1a7caae7fc5 /libcrystfel
parentafcb7b568947c20fb3477a178be5aefe3203b603 (diff)
Meson: Update and fix MsgPack/ZMQ dependencies
Diffstat (limited to 'libcrystfel')
-rw-r--r--libcrystfel/meson.build8
1 files changed, 7 insertions, 1 deletions
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,