diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2022-09-11 00:01:28 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-09-11 00:01:28 +0000 |
| commit | 09e713c5b213be652dd4788a2f7581d3b7e69aca (patch) | |
| tree | 2ec1c124c18dfc6aefc1ce3a5a29c5c795ce4bcd | |
| parent | a4baf128a921957102cac0040ad07ff96b0262af (diff) | |
| parent | 499c15d66a72a41523a379aadca559ae36150fa3 (diff) | |
| download | libgweather-09e713c5b213be652dd4788a2f7581d3b7e69aca.tar.gz | |
Merge branch 'ebassi/deprecated-meson-roots' into 'main'
build: Remove deprecated Meson functions
See merge request GNOME/libgweather!222
| -rw-r--r-- | libgweather/tests/meson.build | 4 | ||||
| -rw-r--r-- | libgweather/tools/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libgweather/tests/meson.build b/libgweather/tests/meson.build index eefe2a3..3574027 100644 --- a/libgweather/tests/meson.build +++ b/libgweather/tests/meson.build @@ -1,6 +1,6 @@ gweather_test_cargs = [ - '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()), - '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root()), + '-DSCHEMASDIR="@0@"'.format(schemas_srcdir), + '-DSCHEMAS_BUILDDIR="@0@"'.format(schemas_builddir), ] gweather_test_env = environment() diff --git a/libgweather/tools/meson.build b/libgweather/tools/meson.build index b50e194..24f5f13 100644 --- a/libgweather/tools/meson.build +++ b/libgweather/tools/meson.build @@ -17,8 +17,8 @@ tools = [ tools_cargs = [ '-DTEST_LOCATIONS="@0@"'.format(locations_bin.full_path()), - '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()), - '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root()), + '-DSCHEMASDIR="@0@"'.format(schemas_srcdir), + '-DSCHEMAS_BUILDDIR="@0@"'.format(schemas_builddir), ] foreach tool: tools diff --git a/meson.build b/meson.build index d8e9d7e..7569564 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,9 @@ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection' build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() build_docs = get_option('gtk_doc') and build_gir +schemas_srcdir = meson.project_source_root() / 'schemas' +schemas_builddir = meson.project_build_root() / 'schemas' + subdir('data') subdir('schemas') subdir('libgweather') |