Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Meson test api c files build fix #2259

Merged
merged 3 commits into from
Mar 14, 2020
Merged

Meson test api c files build fix #2259

merged 3 commits into from
Mar 14, 2020

Commits on Mar 14, 2020

  1. [meson] use add_project_arguments() instead of add_global_arguments() 

    .. and simplify, can pass two languages in one go.

add_global_arguments() won't work if harfbuzz is used as a
meson subproject.
    @tp-m
    tp-m committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    1322eba View commit details
    Browse the repository at this point in the history

  2. [meson] fix spurious warning when building test/api C sources 

    Fixes compiler warning

  test-unicode.c:589:1: warning: ‘test_unicode_properties_lenient’ defined but not used

which didn't happen with autotools.

Reason it does with meson is that the setup for C was slightly wrong.
We would only add -DHAVE_CONFIG_H to cpp_args which is only valid when
compiling C++ code, but not plain C code, and many of these tests were
plain C.

Instead pass -DHAVE_CONFIG_H via add_project_arguments() and make sure
to set both c_args and cpp_args when building test executables.

Fixes harfbuzz#2257
    @tp-m
    tp-m committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7c24cc3 View commit details
    Browse the repository at this point in the history

  3. [meson] fix icu-related linking errors in test with amalgam build 

    test-unicode.c:960: undefined reference to `hb_icu_get_unicode_funcs'
test-unicode.c:961: undefined reference to `hb_icu_get_unicode_funcs'

For now add the icu sources to libharfbuzz also for the amalgam
build, later we need to have a separate harfbuzz-icu module and
link against that, and/or generate harfbuzz.cc.
    @tp-m
    tp-m committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    cfadb01 View commit details
    Browse the repository at this point in the history