diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2018-01-15 13:14:56 +0200 |
|---|---|---|
| committer | Petri Latvala <petri.latvala@intel.com> | 2018-01-17 14:03:18 +0200 |
| commit | 4ebf6877926d35c27738d79b127e93c1d1cee5d5 (patch) | |
| tree | a66cd4721581b44430356186b7b5a7fe56e2b9d7 /lib/meson.build | |
| parent | d4e5b77b341010ae1aac8624175650c32913e3fd (diff) | |
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 <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/meson.build')
| -rw-r--r-- | lib/meson.build | 3 |
1 files changed, 1 insertions, 2 deletions
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]), ]) |