[glib: 1/3] Meson: Fix build error in gdbus-example-objectmanager
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/3] Meson: Fix build error in gdbus-example-objectmanager
- Date: Wed, 14 Nov 2018 15:37:23 +0000 (UTC)
commit b3c899d295e688ba16749d72ac830bf62a6b152e
Author: Xavier Claessens <xavier claessens collabora com>
Date: Fri Nov 9 13:23:43 2018 -0500
Meson: Fix build error in gdbus-example-objectmanager
test_c_args is defined in the root meson.build with unfiltered list of
compiler flags, then redefined in gio/tests/meson.build after the
subdir() call. Move it before.
gio/tests/meson.build | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index b71f61704..7021f03e9 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -5,6 +5,13 @@ common_gio_tests_deps = [
libgio_dep,
]
+test_c_args = [
+ '-DG_LOG_DOMAIN="GLib-GIO"',
+ '-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()),
+ '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums),
+ '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
+]
+
if host_machine.system() == 'windows'
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
endif
@@ -85,13 +92,6 @@ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('GIO_MODULE_DIR', '')
test_env.set('GIO_LAUNCH_DESKTOP', meson.build_root() + '/gio/gio-launch-desktop')
-test_c_args = [
- '-DG_LOG_DOMAIN="GLib-GIO"',
- '-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()),
- '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums),
- '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
-]
-
# Check for libdbus1 - Optional - is only used in the GDBus test cases
# 1.2.14 required for dbus_message_set_serial
dbus1_dep = dependency('dbus-1', required : false, version : '>= 1.2.14')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]