From 5e74695feaaef52d5897798bc069d956c84d3701 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jun 2022 15:07:38 +0200 Subject: Meson: Don't look for cJSON unless Seedee is found --- libcrystfel/meson.build | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'libcrystfel') 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', -- cgit v1.2.3