diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-11-09 13:23:43 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-11-09 13:23:43 -0500 |
| commit | b3c899d295e688ba16749d72ac830bf62a6b152e (patch) | |
| tree | c207189b3a862eb02328a09150f4a179bb2a7596 | |
| parent | 0c6346c98f9ada6387c1ef44cdc25c4abe961c91 (diff) | |
| download | glib-b3c899d295e688ba16749d72ac830bf62a6b152e.tar.gz | |
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.
| -rw-r--r-- | gio/tests/meson.build | 14 |
1 files 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') |