[libgweather/ebassi/deprecated-meson-roots: 3/3] build: Move shared variables in the top level build file
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather/ebassi/deprecated-meson-roots: 3/3] build: Move shared variables in the top level build file
- Date: Sat, 10 Sep 2022 17:39:44 +0000 (UTC)
commit 499c15d66a72a41523a379aadca559ae36150fa3
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Sep 10 18:30:06 2022 +0100
build: Move shared variables in the top level build file
We use the locations of the schemas directory in two places, so we might
as well share the same variables everywhere.
libgweather/tests/meson.build | 3 ---
libgweather/tools/meson.build | 3 ---
meson.build | 3 +++
3 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/libgweather/tests/meson.build b/libgweather/tests/meson.build
index b1f906be..3574027d 100644
--- a/libgweather/tests/meson.build
+++ b/libgweather/tests/meson.build
@@ -1,6 +1,3 @@
-schemas_srcdir = meson.project_source_root() / 'schemas'
-schemas_builddir = meson.project_build_root() / 'schemas'
-
gweather_test_cargs = [
'-DSCHEMASDIR="@0@"'.format(schemas_srcdir),
'-DSCHEMAS_BUILDDIR="@0@"'.format(schemas_builddir),
diff --git a/libgweather/tools/meson.build b/libgweather/tools/meson.build
index 3a05ef1c..24f5f13a 100644
--- a/libgweather/tools/meson.build
+++ b/libgweather/tools/meson.build
@@ -15,9 +15,6 @@ tools = [
}
]
-schemas_srcdir = meson.project_source_root() / 'schemas'
-schemas_builddir = meson.project_build_root() / 'schemas'
-
tools_cargs = [
'-DTEST_LOCATIONS="@0@"'.format(locations_bin.full_path()),
'-DSCHEMASDIR="@0@"'.format(schemas_srcdir),
diff --git a/meson.build b/meson.build
index d8e9d7e6..75695644 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')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]