walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[meson] Always add icu deps

This commit is contained in:
Ebrahim Byagowi 2020-07-06 18:28:31 +04:30
parent 28554cb831
commit 694a0c6bbc
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -28,7 +28,7 @@ jobs:
steps: steps:
- checkout - checkout
- run: HOMEBREW_NO_AUTO_UPDATE=1 brew install meson pkg-config ragel freetype glib cairo python3 icu4c graphite2 - 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 compile -Cbuild
- run: meson test -Cbuild --print-errorlogs - run: meson test -Cbuild --print-errorlogs
@ -38,7 +38,7 @@ jobs:
steps: steps:
- checkout - checkout
- run: HOMEBREW_NO_AUTO_UPDATE=1 brew install meson pkg-config ragel freetype glib cairo python3 icu4c graphite2 gobject-introspection gtk-doc - 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 compile -Cbuild
- run: meson test -Cbuild --print-errorlogs - run: meson test -Cbuild --print-errorlogs

15
test/api/meson.build
View File

@ -73,17 +73,16 @@ env.set('G_TEST_BUILDDIR', meson.current_build_dir())
foreach source : tests foreach source : tests
test_name = source.split('.')[0] 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') if test_name.contains('-subset')
link_withs = [libharfbuzz, libharfbuzz_subset] deps += libharfbuzz_subset_dep
elif test_name == 'test-unicode' and have_icu and not have_icu_builtin suite += 'subset'
link_withs = [libharfbuzz, libharfbuzz_icu]
endif endif
test(test_name, executable(test_name, source, test(test_name, executable(test_name, source,
include_directories: [incconfig, incsrc], include_directories: [incconfig],
dependencies: [glib_dep, freetype_dep, thread_dep], dependencies: deps,
link_with: link_withs,
install: false, install: false,
), env: env, suite: ['api'] + (test_name.contains('-subset') ? ['subset'] : [])) ), env: env, suite: suite)
endforeach endforeach