From f88acc0446de81afb962af5ef381f74e7ca2c296 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Sun, 25 Feb 2024 10:39:02 +0000 Subject: [PATCH] build: add cld2 option Add an option for builders to explicitly disable cld2, instead of relying on the automatic detection. --- meson.build | 6 +++--- meson_options.txt | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 6f4623b2..ab2aead8 100644 --- a/meson.build +++ b/meson.build @@ -189,11 +189,11 @@ else endif # optionally, use Compact Language Detector2 if we can find it. -cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: false) -if cld2_dep.found() +cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: get_option('cld2')) +if not get_option('cld2').disabled() and cld2_dep.found() config_h_data.set('HAVE_CLD2', 1) else - message('CLD2 not found; no support for language detection') + message('CLD2 not found or disabled; no support for language detection') endif # note: these are for the unit-tests diff --git a/meson_options.txt b/meson_options.txt index eabdc00b..93bc7dbc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,6 +24,11 @@ option('guile', value: 'auto', description: 'build the guile scripting support (requires guile-3.x)') +option('cld2', + type : 'feature', + value: 'auto', + description: 'Compact Language Detector2') + # by default, this uses guile_dep.get_variable(pkgconfig: 'extensiondir') option('guile-extension-dir', type: 'string',