From 282673635374cb2dc06da97fc14a592d2ea16bdf Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 5 Apr 2023 13:54:30 -0500 Subject: [PATCH] =?UTF-8?q?feat(core):=20icu=20integration=20steps=20?= =?UTF-8?q?=F0=9F=99=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fallback to pkg-config if meson ≤ 0.57 for #8495 --- core/tests/unit/ldml/meson.build | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/tests/unit/ldml/meson.build b/core/tests/unit/ldml/meson.build index 7afc06872c..3425b27211 100644 --- a/core/tests/unit/ldml/meson.build +++ b/core/tests/unit/ldml/meson.build @@ -6,10 +6,17 @@ # ICU4C is used for repertoire tests -icu4c = subproject('icu-minimal', default_options: [ 'default_library=static', 'cpp_std=c++17', 'warning_level=0', -'werror=false']) # TODO-LDML: options: static, no data -icu_uc = icu4c.get_variable('icuuc_dep') +if meson.version().version_compare('<=0.57.0') # TODO-LDML: right # here? + # fallback to pkg-config + pkgconfig = 'pkg-config' + icu_uc = dependency('icu-uc', required: true) +else + icu4c = subproject('icu-minimal', default_options: [ 'default_library=static', 'cpp_std=c++17', 'warning_level=0', +'werror=false']) # TODO-LDML: options: static, no data + icu_uc = icu4c.get_variable('icuuc_dep') +endif + if icu_uc.found() defns += '-DHAVE_ICU4C'