summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2022-09-10 18:30:06 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2022-09-10 18:38:33 +0100
commit499c15d66a72a41523a379aadca559ae36150fa3 (patch)
tree2ec1c124c18dfc6aefc1ce3a5a29c5c795ce4bcd
parentda349aaf58b4facaa3a1720e8c973c9bffb4c887 (diff)
downloadlibgweather-499c15d66a72a41523a379aadca559ae36150fa3.tar.gz
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.
-rw-r--r--libgweather/tests/meson.build3
-rw-r--r--libgweather/tools/meson.build3
-rw-r--r--meson.build3
3 files changed, 3 insertions, 6 deletions
diff --git a/libgweather/tests/meson.build b/libgweather/tests/meson.build
index b1f906b..3574027 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 3a05ef1..24f5f13 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 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')