diff options
| author | Thomas White <taw@physics.org> | 2022-06-02 15:07:38 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-06-02 15:25:20 +0200 |
| commit | 5e74695feaaef52d5897798bc069d956c84d3701 (patch) | |
| tree | 3b84731a1b01101710333f892517d83dd1261d28 /libcrystfel | |
| parent | d228555f873967801633d02cdb55bae9dbdf9bfc (diff) | |
Meson: Don't look for cJSON unless Seedee is found
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/meson.build | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libcrystfel/meson.build b/libcrystfel/meson.build index 41cfbaa8..592ec22e 100644 --- a/libcrystfel/meson.build +++ b/libcrystfel/meson.build @@ -26,11 +26,16 @@ if fftwdep.found() endif seedeedep = dependency('seedee', required: false) -cjsondep = dependency('cjson', - required: true, - fallback: ['cjson', 'libcjson_dep']) -if cjsondep.found() and seedeedep.found() - conf_data.set10('HAVE_SEEDEE', 1) +if seedeedep.found() + cjsondep = dependency('cjson', + required: true, + fallback: ['cjson', 'libcjson_dep']) + if cjsondep.found() and seedeedep.found() + conf_data.set10('HAVE_SEEDEE', true) + endif +else + # Default 'not found' dependency + cjsondep = dependency('', required : false) endif xgandalfdep = dependency('xgandalf', |