|
 |
73b847 |
From 5be8080ced85d14d7d8905827a8d2af40fcddd8d Mon Sep 17 00:00:00 2001
|
|
|
73b847 |
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
|
|
|
73b847 |
Date: Thu, 5 Dec 2019 14:39:45 +0100
|
|
|
73b847 |
Subject: [PATCH 102/181] tests/meson: Set the typelib env var only if we have
|
|
|
73b847 |
introspection
|
|
|
73b847 |
|
|
|
73b847 |
---
|
|
|
73b847 |
tests/meson.build | 3 ++-
|
|
|
73b847 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
73b847 |
|
|
|
73b847 |
diff --git a/tests/meson.build b/tests/meson.build
|
|
|
73b847 |
index d6196be..6e56cb3 100644
|
|
|
73b847 |
--- a/tests/meson.build
|
|
|
73b847 |
+++ b/tests/meson.build
|
|
|
73b847 |
@@ -5,7 +5,6 @@ envs.set('G_MESSAGES_DEBUG', 'all')
|
|
|
73b847 |
|
|
|
73b847 |
# Setup paths
|
|
|
73b847 |
envs.set('MESON_SOURCE_ROOT', meson.build_root())
|
|
|
73b847 |
-envs.prepend('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'libfprint'))
|
|
|
73b847 |
envs.prepend('LD_LIBRARY_PATH', join_paths(meson.build_root(), 'libfprint'))
|
|
|
73b847 |
|
|
|
73b847 |
# Set FP_DEVICE_EMULATION so that drivers can adapt (e.g. to use fixed
|
|
|
73b847 |
@@ -15,6 +14,8 @@ envs.set('FP_DEVICE_EMULATION', '1')
|
|
|
73b847 |
envs.set('NO_AT_BRIDGE', '1')
|
|
|
73b847 |
|
|
|
73b847 |
if get_option('introspection')
|
|
|
73b847 |
+ envs.prepend('GI_TYPELIB_PATH', join_paths(meson.build_root(), 'libfprint'))
|
|
|
73b847 |
+
|
|
|
73b847 |
if 'virtual_image' in drivers
|
|
|
73b847 |
test('virtual-image',
|
|
|
73b847 |
find_program('virtual-image.py'),
|
|
|
73b847 |
--
|
|
|
73b847 |
2.24.1
|
|
|
73b847 |
|