From 694a0c6bbc7c7f8dae9617bb3e1718bba940ce6a Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Mon, 6 Jul 2020 18:28:31 +0430 Subject: [PATCH] [meson] Always add icu deps --- .circleci/config.yml | 4 ++-- test/api/meson.build | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1dea77ae..5224e1e31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: steps: - checkout - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install meson pkg-config ragel freetype glib cairo python3 icu4c graphite2 - - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" CPPFLAGS="-I/usr/local/opt/icu4c/include" meson build -Dcoretext=enabled + - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled - run: meson compile -Cbuild - run: meson test -Cbuild --print-errorlogs @@ -38,7 +38,7 @@ jobs: steps: - checkout - run: HOMEBREW_NO_AUTO_UPDATE=1 brew install meson pkg-config ragel freetype glib cairo python3 icu4c graphite2 gobject-introspection gtk-doc - - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" CPPFLAGS="-I/usr/local/opt/icu4c/include" meson build -Dcoretext=enabled -Dgraphite=enabled -Dauto_features=enabled + - run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Dcoretext=enabled -Dgraphite=enabled -Dauto_features=enabled - run: meson compile -Cbuild - run: meson test -Cbuild --print-errorlogs diff --git a/test/api/meson.build b/test/api/meson.build index 7c9862592..5c8b6022f 100644 --- a/test/api/meson.build +++ b/test/api/meson.build @@ -73,17 +73,16 @@ env.set('G_TEST_BUILDDIR', meson.current_build_dir()) foreach source : tests test_name = source.split('.')[0] - link_withs = libharfbuzz + deps = [glib_dep, freetype_dep, thread_dep, libharfbuzz_dep, libharfbuzz_icu_dep] + suite = ['api'] if test_name.contains('-subset') - link_withs = [libharfbuzz, libharfbuzz_subset] - elif test_name == 'test-unicode' and have_icu and not have_icu_builtin - link_withs = [libharfbuzz, libharfbuzz_icu] + deps += libharfbuzz_subset_dep + suite += 'subset' endif test(test_name, executable(test_name, source, - include_directories: [incconfig, incsrc], - dependencies: [glib_dep, freetype_dep, thread_dep], - link_with: link_withs, + include_directories: [incconfig], + dependencies: deps, install: false, - ), env: env, suite: ['api'] + (test_name.contains('-subset') ? ['subset'] : [])) + ), env: env, suite: suite) endforeach