diff options
| author | Thomas White <taw@physics.org> | 2023-06-06 13:41:52 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-06-06 13:41:52 +0200 |
| commit | 117ed0d0339163e04290349f9fe468b4bb6982e7 (patch) | |
| tree | b96e7dfb22cb27d8272a21f155817f7eec257e3e /meson.build | |
| parent | de407aa9fa93192aad6773a53fe51295d9c8cb8e (diff) | |
| parent | b5550e4399415fe4863057d6cbd406faf3f2df31 (diff) | |
Merge branch 'asapo-producer'
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/meson.build b/meson.build index 8f6567fa..c07a326a 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,7 @@ project('crystfel', 'c', default_options: ['buildtype=debugoptimized']) libcrystfel_api_version = 16 +crystfel_rpath = '$ORIGIN/../lib64/:$ORIGIN/../lib:$ORIGIN/../../asapo-libraries/lib:$ORIGIN/../../asapo-libraries/lib64' add_project_arguments('-DHAVE_CONFIG_H', language: 'c') @@ -53,9 +54,16 @@ if zmqdep.found() conf_data.set10('HAVE_ZMQ', true) endif -asapodep = dependency('libasapo-consumer', required: false) -if asapodep.found() - conf_data.set10('HAVE_ASAPO', true) +# There are two separate dependencies for ASAP::O (consumer and producer) +# We need both of them. +asapoproddep = dependency('libasapo-producer', required: false) +if asapoproddep.found() + asapodep = dependency('libasapo-consumer', required: true) + if asapodep.found() + conf_data.set10('HAVE_ASAPO', true) + endif +else + asapodep = dependency('', required: false) endif if cc.has_function('clock_gettime', prefix: '#include <time.h>') @@ -112,7 +120,7 @@ executable('compare_hkl', ['src/compare_hkl.c', versionc], dependencies: [mdep, libcrystfeldep, gsldep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) # check_hkl executable('check_hkl', @@ -131,21 +139,21 @@ partialator = executable('partialator', versionc], dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) # ambigator executable('ambigator', ['src/ambigator.c', versionc], dependencies: [mdep, libcrystfeldep, gsldep, hdf5dep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) # whirligig executable('whirligig', ['src/whirligig.c', versionc], dependencies: [mdep, libcrystfeldep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) # indexamajig indexamajig_sources = ['src/indexamajig.c', 'src/im-sandbox.c', @@ -161,9 +169,9 @@ endif indexamajig = executable('indexamajig', indexamajig_sources, dependencies: [mdep, libcrystfeldep, gsldep, - pthreaddep, zmqdep, asapodep], + pthreaddep, zmqdep, asapodep, asapoproddep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) # make_pixelmap if hdf5dep.found() @@ -171,7 +179,7 @@ if hdf5dep.found() ['src/make_pixelmap.c', versionc], dependencies: [mdep, libcrystfeldep, hdf5dep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) endif @@ -206,7 +214,7 @@ if gtkdep.found() executable('crystfel', gui_sources, gresources, dependencies: [mdep, libcrystfeldep, gtkdep, gsldep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) install_data(['data/crystfel.desktop'], install_dir: get_option('datadir') / 'applications') @@ -218,7 +226,7 @@ executable('render_hkl', ['src/render_hkl.c', versionc], dependencies: [mdep, libcrystfeldep, cairodep, gsldep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) # cell_explorer if gtkdep.found() @@ -226,7 +234,7 @@ if gtkdep.found() ['src/cell_explorer.c', 'src/multihistogram.c', versionc], dependencies: [mdep, libcrystfeldep, gtkdep, gsldep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) install_data(['data/cell_explorer.desktop'], install_dir: get_option('datadir') / 'applications') |