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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/meson.build | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tools/meson.build b/tools/meson.build index 4258853e..acd9242d 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -56,8 +56,6 @@ foreach prog : tools_progs install : true) endforeach -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'intel-gpu-tools') - if libudev.found() intel_dp_compliance_src = [ 'intel_dp_compliance.c', @@ -78,14 +76,12 @@ executable('intel_reg', sources : intel_reg_src, dependencies : tool_deps, install : true, c_args : [ - '-DIGT_DATADIR="@0@"'.format(pkgdatadir), + '-DIGT_DATADIR="@0@"'.format(datadir), ]) -bindir = join_paths(get_option('prefix'), get_option('bindir')) - install_data('intel_gpu_abrt', install_dir : bindir) -install_subdir('registers', install_dir : pkgdatadir, +install_subdir('registers', install_dir : datadir, exclude_files : [ 'Makefile', 'Makefile.in', 'Makefile.am', ]) @@ -96,10 +92,10 @@ shared_library('intel_aubdump', 'aubdump.c', install : true) conf_data = configuration_data() -conf_data.set('prefix', get_option('prefix')) +conf_data.set('prefix', prefix) conf_data.set('exec_prefix', '${prefix}') -conf_data.set('libdir', join_paths('${prefix}', get_option('libdir'))) +conf_data.set('libdir', join_paths('${prefix}', libdir)) configure_file(input : 'intel_aubdump.in', output : 'intel_aubdump', - configuration : conf_data, install_dir : get_option('bindir')) + configuration : conf_data, install_dir : bindir) subdir('null_state_gen') |