gplugin/gplugin

Both tcc/ and vala/ were also referencing meson.build_root
feature/meson-subproject-fix
2019-08-12, Gary Kramlich
6354bdbff214
Parents 923cbd2a8055
Children db07c1e0541f
Both tcc/ and vala/ were also referencing meson.build_root
2 files changed, 3 insertions(+), 3 deletions(-)
  • +1 -1
    tcc/tests/meson.build
  • +2 -2
    vala/meson.build
    • --- a/tcc/tests/meson.build Mon Aug 12 21:14:06 2019 -0500
    +++ b/tcc/tests/meson.build Mon Aug 12 22:11:42 2019 -0500
    @@ -2,7 +2,7 @@
    e = executable('test-tcc-loader', 'test-tcc-loader.c',
    c_args : [
    - '-DTCC_LOADER_DIR="@0@/tcc"'.format(meson.build_root()),
    + '-DTCC_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    '-DTCC_PLUGIN_DIR="@0@/plugins"'.format(
    meson.current_source_dir()),
    ],
    --- a/vala/meson.build Mon Aug 12 21:14:06 2019 -0500
    +++ b/vala/meson.build Mon Aug 12 22:11:42 2019 -0500
    @@ -8,7 +8,7 @@
    gplugin_vapi = gnome.generate_vapi('gplugin',
    sources : gplugin_gir[0],
    install : true,
    - gir_dirs : join_paths(meson.build_root(), 'gplugin'),
    + gir_dirs : join_paths(meson.current_build_dir(), '..', 'gplugin'),
    )
    if get_option('gtk3')
    @@ -16,7 +16,7 @@
    sources : gplugin_gtk_gir[0],
    packages : [ 'gtk+-3.0' ],
    install : true,
    - gir_dirs : join_paths(meson.build_root(), 'gplugin'),
    + gir_dirs : join_paths(meson.current_build_dir(), '..', 'gplugin'),
    )
    endif