ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

meson: use current_source_dir and current_build_dir instead of *_root 

The latter doesn't work correctly when being used as a subproject, as it
returns the *absolute* root. So if pkgconf is being built as part of
muon, then it will return muon's source root. current_source_dir, on the
other hand returns the directory correctly whether being built as a
subproject or superproject.
pull/240/head
Dylan Baker 2022-07-29 10:40:54 -07:00
parent 1f993bc095
commit 06fe2e23b0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -51,8 +51,8 @@ cdata.set_quoted('PERSONALITY_PATH', ':'.join(personality_path))
cdata.set_quoted('PACKAGE_NAME', meson.project_name()) cdata.set_quoted('PACKAGE_NAME', meson.project_name())
cdata.set_quoted('PACKAGE_VERSION', meson.project_version()) cdata.set_quoted('PACKAGE_VERSION', meson.project_version())
cdata.set_quoted('PACKAGE_BUGREPORT', 'https://todo.sr.ht/~kaniini/pkgconf') cdata.set_quoted('PACKAGE_BUGREPORT', 'https://todo.sr.ht/~kaniini/pkgconf')
cdata.set('abs_top_srcdir', meson.source_root()) cdata.set('abs_top_srcdir', meson.current_source_dir())
cdata.set('abs_top_builddir', meson.build_root()) cdata.set('abs_top_builddir', meson.current_build_dir())
subdir('libpkgconf') subdir('libpkgconf')
@ -119,8 +119,7 @@ pkgconf_exe = executable('pkgconf',
if get_option('tests') if get_option('tests')
kyua_exe = find_program('kyua') kyua_exe = find_program('kyua')
atf_sh_exe = find_program('atf-sh') atf_sh_exe = find_program('atf-sh')
test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile=' + join_paths(meson.build_root(), 'Kyuafile'), '--build-root=' + meson.build_root()]) test('kyua', kyua_exe, args : ['--config=none', 'test', '--kyuafile=' + join_paths(meson.current_build_dir(), 'Kyuafile'), '--build-root=' + meson.current_build_dir()])
configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata) configure_file(input : 'Kyuafile.in', output : 'Kyuafile', configuration : cdata)
subdir('tests') subdir('tests')

2
tests/meson.build
View File

@ -19,5 +19,5 @@ tests = [
# yuck # yuck
foreach test : tests foreach test : tests
configure_file(input: test + '.sh', output: test, copy: true) configure_file(input: test + '.sh', output: test, copy: true)
run_command('chmod', '755', join_paths(meson.build_root(), 'tests', test)) run_command('chmod', '755', join_paths(meson.current_build_dir(), 'tests', test))
endforeach endforeach