[glib: 2/10] tests: Avoid using deprecated meson.build_root
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 2/10] tests: Avoid using deprecated meson.build_root
- Date: Sun, 24 Jul 2022 23:31:32 +0000 (UTC)
commit 67513929344f68b2a1f8c1af6f45d3d3ab55a0b9
Author: Simon McVittie <smcv collabora com>
Date: Thu Jul 14 15:56:28 2022 +0100
tests: Avoid using deprecated meson.build_root
Signed-off-by: Simon McVittie <smcv collabora com>
gio/meson.build | 2 +-
gio/tests/meson.build | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index b520b5a7bf..60ca579d1a 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -400,7 +400,7 @@ if host_system != 'windows'
appinfo_sources += files('gdesktopappinfo.c')
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,
c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index c3e5489329..c3e4e4cb33 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -148,7 +148,10 @@ test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
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')
+
+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
# 1.2.14 required for dbus_message_set_serial
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]