gplugin/gplugin

Merged in feature/meson-subproject-fix (pull request #28)
develop
2019-08-16, Gary Kramlich
0bf40d5b40ac
Parents 07041918dfcddb07c1e0541f
Children 6e32283b41d7aa2d3e096cf9
Merged in feature/meson-subproject-fix (pull request #28)

Fix the build when ran in a meson subproject.

Approved-by: Elliott Sales de Andrade
4 files changed, 7 insertions(+), 7 deletions(-)
  • +2 -2
    lua/tests/meson.build
  • +2 -2
    python/tests/meson.build
  • +1 -1
    tcc/tests/meson.build
  • +2 -2
    vala/meson.build
    • --- a/lua/tests/meson.build Fri Aug 16 04:23:26 2019 +0000
    +++ b/lua/tests/meson.build Fri Aug 16 04:36:50 2019 +0000
    @@ -2,7 +2,7 @@
    e = executable('test-lua-loader', 'test-lua-loader.c',
    c_args : [
    - '-DLUA_LOADER_DIR="@0@/lua"'.format(meson.build_root()),
    + '-DLUA_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    '-DLUA_PLUGIN_DIR="@0@/lua-plugins"'.format(
    meson.current_source_dir()),
    '-DMOONSCRIPT_PLUGIN_DIR="@0@/moonscript-plugins"'.format(
    @@ -15,7 +15,7 @@
    if get_option('moonscript-tests')
    e = executable('test-lua-moon-loader', 'test-lua-moon-loader.c',
    c_args : [
    - '-DLUA_LOADER_DIR="@0@/lua"'.format(meson.build_root()),
    + '-DLUA_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    '-DLUA_PLUGIN_DIR="@0@/lua-plugins"'.format(
    meson.current_source_dir()),
    '-DMOONSCRIPT_PLUGIN_DIR="@0@/moonscript-plugins"'.format(
    --- a/python/tests/meson.build Fri Aug 16 04:23:26 2019 +0000
    +++ b/python/tests/meson.build Fri Aug 16 04:36:50 2019 +0000
    @@ -3,7 +3,7 @@
    e = executable('test-python-loader', 'test-python-loader.c',
    include_directories : include_directories('.'),
    c_args : [
    - '-DPYTHON_LOADER_DIR="@0@/python"'.format(meson.build_root()),
    + '-DPYTHON_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    '-DPYTHON_PLUGIN_DIR="@0@/plugins"'.format(meson.current_source_dir()),
    ],
    link_with : gplugin_loader_tests,
    @@ -15,7 +15,7 @@
    e = executable('test-python-utils', 'test-python-utils.c',
    include_directories : include_directories('.'),
    c_args : [
    - '-DPYTHON_LOADER_DIR="@0@/python"'.format(meson.build_root()),
    + '-DPYTHON_LOADER_DIR="@0@"'.format(join_paths(meson.current_build_dir(), '..')),
    '-DPYTHON_PLUGIN_DIR="@0@/plugins"'.format(meson.current_source_dir()),
    ],
    link_with : [gplugin_loader_tests],
    --- a/tcc/tests/meson.build Fri Aug 16 04:23:26 2019 +0000
    +++ b/tcc/tests/meson.build Fri Aug 16 04:36:50 2019 +0000
    @@ -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 Fri Aug 16 04:23:26 2019 +0000
    +++ b/vala/meson.build Fri Aug 16 04:36:50 2019 +0000
    @@ -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