luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 22:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Avoid using deprecated meson.build_root

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-07-14 15:56:28 +01:00 committed by Philip Withnall
parent d0967c1d4a
commit 6751392934
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/meson.build
View File

@ -400,7 +400,7 @@ if host_system != 'windows'
appinfo_sources += files('gdesktopappinfo.c') appinfo_sources += files('gdesktopappinfo.c')
gio_unix_include_headers += files('gdesktopappinfo.h') gio_unix_include_headers += files('gdesktopappinfo.h')
executable('gio-launch-desktop', 'gio-launch-desktop.c', gio_launch_desktop = executable('gio-launch-desktop', 'gio-launch-desktop.c',
install : true, install : true,
c_args : gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH

5
gio/tests/meson.build
View File

@ -148,7 +148,10 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
test_env.set('GIO_MODULE_DIR', '') test_env.set('GIO_MODULE_DIR', '')
test_env.set('GIO_LAUNCH_DESKTOP', meson.build_root() + '/gio/gio-launch-desktop')
if host_system != 'windows' and not glib_have_cocoa
test_env.set('GIO_LAUNCH_DESKTOP', gio_launch_desktop.full_path())
endif
# Check for libdbus1 - Optional - is only used in the GDBus test cases # Check for libdbus1 - Optional - is only used in the GDBus test cases
# 1.2.14 required for dbus_message_set_serial # 1.2.14 required for dbus_message_set_serial