From 4ebf6877926d35c27738d79b127e93c1d1cee5d5 Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Mon, 15 Jan 2018 13:14:56 +0200 Subject: meson: Refactor get_option() calls for directories Fetch the configuration values in the toplevel meson.build for all subdirs to share. v2: Also remember tests/intel-ci/meson.build Signed-off-by: Petri Latvala Cc: Daniel Vetter Reviewed-by: Daniel Vetter --- lib/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/meson.build') diff --git a/lib/meson.build b/lib/meson.build index 311e2342..b3bbc311 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -145,7 +145,6 @@ if chamelium.found() lib_sources += 'igt_chamelium.c' endif -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools') srcdir = join_paths(meson.source_root(), 'tests') lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', @@ -160,7 +159,7 @@ foreach f: lib_sources include_directories: inc, dependencies : lib_deps, c_args : [ - '-DIGT_DATADIR="@0@"'.format(pkgdatadir), + '-DIGT_DATADIR="@0@"'.format(datadir), '-DIGT_SRCDIR="@0@"'.format(srcdir), '-DIGT_LOG_DOMAIN="@0@"'.format(f.split('.')[0]), ]) -- cgit v1.2.3