diff options
| author | lakoliu <99976966+lakoliu@users.noreply.github.com> | 2022-07-24 10:09:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-24 10:09:08 +0300 |
| commit | 0aeda0ca3607d84e29e4e60a845cca721f748610 (patch) | |
| tree | 347f45dca0e617722a335953571b572baad3795b /src/meson.build | |
| parent | 996f669796e83f08fd92506441e0340c0f393f61 (diff) | |
| parent | 1889c11e0dcd995372e6f7876be701ad65b1c64a (diff) | |
| download | Furtherance-0aeda0ca3607d84e29e4e60a845cca721f748610.tar.zst | |
Merge pull request #80 from winterqt/gnome-post-install
Switch to gnome.post_install
Diffstat (limited to 'src/meson.build')
| -rwxr-xr-x | src/meson.build | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/meson.build b/src/meson.build index 3afd404..b2bde7b 100755 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,4 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -gnome = import('gnome') gnome.compile_resources('furtherance', 'furtherance.gresource.xml', @@ -25,8 +24,8 @@ configure_file( # Copy the config.rs output to the source directory. run_command( 'cp', - join_paths(meson.build_root(), 'src', 'config.rs'), - join_paths(meson.source_root(), 'src', 'config.rs'), + join_paths(meson.project_build_root(), 'src', 'config.rs'), + join_paths(meson.project_source_root(), 'src', 'config.rs'), check: true ) @@ -50,7 +49,7 @@ rust_sources = files( sources = [cargo_sources, rust_sources] -cargo_script = find_program(join_paths(meson.source_root(), 'build-aux/cargo.sh')) +cargo_script = find_program(join_paths(meson.project_source_root(), 'build-aux/cargo.sh')) cargo_release = custom_target( 'cargo-build', build_by_default: true, @@ -61,8 +60,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'), meson.project_name(), |