diff --git a/data/meson.build b/data/meson.build index ece5fc6..156e597 100644 --- a/data/meson.build +++ b/data/meson.build @@ -27,7 +27,7 @@ polkit_policy = 'net.reactivated.fprint.device.policy' polkit_policy_target = i18n.merge_file( input: '@0@.in'.format(polkit_policy), output: polkit_policy, - po_dir: meson.source_root() / 'po', + po_dir: meson.project_source_root() / 'po', install: true, install_dir: polkit_policy_directory, ) diff --git a/meson.build b/meson.build index d32af5d..5e0f16b 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('fprintd', 'c', 'warning_level=3', 'c_std=gnu99', ], - meson_version: '>= 0.50.0') + meson_version: '>= 0.56.0') gnome = import('gnome') i18n = import('i18n') diff --git a/tests/meson.build b/tests/meson.build index a9f5573..cfc3016 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -31,8 +31,8 @@ foreach t: tests 'env': [ 'G_DEBUG=fatal-criticals', 'G_MESSAGES_DEBUG=all', - 'FPRINT_BUILD_DIR=' + meson.build_root() / 'src', - 'TOPSRCDIR=' + meson.source_root(), + 'FPRINT_BUILD_DIR=' + meson.project_build_root() / 'src', + 'TOPSRCDIR=' + meson.project_source_root(), ], 'depends': [ fprintd, @@ -75,7 +75,7 @@ foreach pt: python_tests args: ut_args, suite: ut_suite, depends: pt.get('depends', []), - workdir: pt.get('workdir', meson.build_root()), + workdir: pt.get('workdir', meson.project_build_root()), env: pt.get('env', []), timeout: pt.get('timeout', 30), is_parallel: pt.get('is_parallel', true), diff --git a/tests/pam/meson.build b/tests/pam/meson.build index 02d48a9..64dc0ae 100644 --- a/tests/pam/meson.build +++ b/tests/pam/meson.build @@ -49,8 +49,8 @@ foreach t: tests 'file': files(meson.current_source_dir() / t + '.py')[0], 'is_parallel': false, 'env': [ - 'TOPBUILDDIR=' + meson.build_root(), - 'TOPSRCDIR=' + meson.source_root(), + 'TOPBUILDDIR=' + meson.project_build_root(), + 'TOPSRCDIR=' + meson.project_source_root(), 'LD_PRELOAD=' + ' '.join(pam_tests_ld_preload), 'PAM_WRAPPER=1', 'PAM_WRAPPER_DEBUGLEVEL=2',