From c9c7509e02e2ce653ca05ad1ea45acd3c8cc7d75 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 9 Nov 2018 13:23:43 -0500 Subject: [PATCH] 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 1ab7d7379..e0d5db9df 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 @@ -88,13 +95,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')