diff --git a/meson.build b/meson.build index 094910d..1009f60 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('gst_pipeline_studio', version: '0.3.2', - meson_version: '>= 0.50.0', + meson_version: '>= 0.63.0', default_options: [ 'warning_level=2', ], license: 'GPL-3.0-or-later', @@ -36,7 +36,7 @@ localedir = prefix / get_option('localedir') datadir = prefix / get_option('datadir') pkgdatadir = datadir / meson.project_name() iconsdir = datadir / 'icons' -podir = meson.source_root () / 'po' +podir = meson.project_source_root () / 'po' gettext_package = meson.project_name() base_id = 'org.freedesktop.dabrain34.GstPipelineStudio' @@ -70,8 +70,8 @@ subdir('po') meson.add_dist_script( 'build-aux/dist-vendor.sh', - meson.source_root(), - join_paths(meson.build_root(), 'meson-dist', meson.project_name() + '-' + version) + meson.project_source_root(), + join_paths(meson.project_build_root(), 'meson-dist', meson.project_name() + '-' + version) ) if host_system == 'linux' meson.add_install_script('build-aux/meson/postinstall.py') diff --git a/src/meson.build b/src/meson.build index a26b4c5..aadec57 100644 --- a/src/meson.build +++ b/src/meson.build @@ -9,7 +9,7 @@ configure_file( ) # Copy the config.rs output to the source directory. -run_command(python3, '-c', 'import shutil; shutil.copyfile("@0@", "@1@")'.format(join_paths(meson.build_root(), 'src', 'config.rs'), join_paths(meson.source_root(), 'src', 'config.rs'))) +run_command(python3, '-c', 'import shutil; shutil.copyfile("@0@", "@1@")'.format(join_paths(meson.project_build_root(), 'src', 'config.rs'), join_paths(meson.project_source_root(), 'src', 'config.rs'))) rust_sources = files( 'gps/player.rs', @@ -38,7 +38,7 @@ rust_sources = files( sources = [cargo_sources, rust_sources] -cargo_script = find_program(join_paths(meson.source_root(), 'build-aux/cargo.py')) +cargo_script = find_program(join_paths(meson.project_source_root(), 'build-aux/cargo.py')) app_name = meson.project_name() if host_system == 'windows' @@ -55,8 +55,8 @@ cargo_release = custom_target( install_dir: get_option('bindir'), command: [ cargo_script, - meson.build_root(), - meson.source_root(), + meson.project_build_root(), + meson.project_source_root(), '@OUTPUT@', get_option('buildtype'), app_name,