diff options
| author | Thomas White <taw@physics.org> | 2021-04-16 10:47:50 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2021-04-16 10:47:50 +0200 |
| commit | ab07fd8a99b3199bf4aff52b32432e4fd24f7b3a (patch) | |
| tree | 1e62089bb7d168ca1e2041a5f535d1a7caae7fc5 | |
| parent | afcb7b568947c20fb3477a178be5aefe3203b603 (diff) | |
Meson: Update and fix MsgPack/ZMQ dependencies
| -rw-r--r-- | libcrystfel/meson.build | 8 | ||||
| -rw-r--r-- | meson.build | 10 |
2 files changed, 9 insertions, 9 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, diff --git a/meson.build b/meson.build index 12b601c0..680edf05 100644 --- a/meson.build +++ b/meson.build @@ -85,11 +85,6 @@ if zmqdep.found() conf_data.set10('HAVE_ZMQ', 1) endif -msgpackdep = dependency('msgpack', required : false) -if msgpackdep.found() - conf_data.set10('HAVE_MSGPACK', 1) -endif - if cc.has_function('clock_gettime', prefix : '#include <time.h>') conf_data.set10('HAVE_CLOCK_GETTIME', 1) endif @@ -184,13 +179,12 @@ executable('whirligig', indexamajig_sources = ['src/indexamajig.c', 'src/im-sandbox.c', 'src/process_image.c', 'src/time-accounts.c', versionc] -if zmqdep.found() and msgpackdep.found() +if zmqdep.found() indexamajig_sources += ['src/im-zmq.c'] endif executable('indexamajig', indexamajig_sources, - dependencies : [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, - msgpackdep], + dependencies : [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep], install : true, install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') |