diff options
| author | Thomas White <taw@physics.org> | 2023-04-21 17:07:56 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-07-28 13:22:04 +0200 |
| commit | 01f6f6ec756a435c0187154627e3a8900bcd3e11 (patch) | |
| tree | 45ef1d6fa9aff86b366a40b8366ee02142d4e815 /libcrystfel | |
| parent | 22be2dbc3352dc13978fac5135ddb0141c9625e4 (diff) | |
Add wrapped Millepede dependency
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/libcrystfel-config.h.meson.in | 1 | ||||
| -rw-r--r-- | libcrystfel/meson.build | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libcrystfel/libcrystfel-config.h.meson.in b/libcrystfel/libcrystfel-config.h.meson.in index 302fae0b..c788c017 100644 --- a/libcrystfel/libcrystfel-config.h.meson.in +++ b/libcrystfel/libcrystfel-config.h.meson.in @@ -11,6 +11,7 @@ #mesondefine HAVE_CLOCK_GETTIME #mesondefine HAVE_HDF5 #mesondefine HAVE_SEEDEE +#mesondefine HAVE_MILLEPEDE #mesondefine HAVE_FORKPTY_PTY_H #mesondefine HAVE_FORKPTY_UTIL_H diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 8897aaae..cacf0e82 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -38,6 +38,13 @@ else cjsondep = dependency('', required : false) endif +millepededep = dependency('millepede', + required: false, + fallback: ['millepede', 'millepede_dep']) +if millepededep.found() + conf_data.set10('HAVE_MILLEPEDE', true) +endif + xgandalfdep = dependency('xgandalf', required: false, fallback: ['xgandalf', 'xgandalf_dep']) @@ -167,7 +174,8 @@ libcrystfel = library('crystfel', [libcrystfel_sources, libcrystfel_versionc], dependencies: [mdep, utildep, fftwdep, gsldep, zlibdep, hdf5dep, pthreaddep, xgandalfdep, pinkindexerdep, fdipdep, - ccp4dep, msgpackdep, seedeedep, cjsondep], + ccp4dep, msgpackdep, seedeedep, cjsondep, + millepededep], install: true) libcrystfeldep = declare_dependency(include_directories: libcrystfel_includes, |