From e7b4eb4d9db2f9538bc995f04426c4fa678d305e Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 6 Apr 2023 12:59:00 -0500 Subject: [PATCH] =?UTF-8?q?fix(core):=20use=20pkgconfig=20on=20linux,=20el?= =?UTF-8?q?se=20wrap=20=F0=9F=99=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For: feat(core): integrate ICU4C into the build for ldml 🙀 #8495 --- core/tests/unit/ldml/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/tests/unit/ldml/meson.build b/core/tests/unit/ldml/meson.build index 3425b27211..bf2c73721f 100644 --- a/core/tests/unit/ldml/meson.build +++ b/core/tests/unit/ldml/meson.build @@ -7,13 +7,14 @@ # ICU4C is used for repertoire tests -if meson.version().version_compare('<=0.57.0') # TODO-LDML: right # here? - # fallback to pkg-config +if build_machine.system() == 'linux' + # use pkg-config on linux pkgconfig = 'pkg-config' icu_uc = dependency('icu-uc', required: true) else + # load ICU from wrap icu4c = subproject('icu-minimal', default_options: [ 'default_library=static', 'cpp_std=c++17', 'warning_level=0', -'werror=false']) # TODO-LDML: options: static, no data +'werror=false']) # TODO-LDML: options: static, no data (these are in the meson build files) icu_uc = icu4c.get_variable('icuuc_dep') endif