diff options
| author | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-08-13 13:16:22 +0300 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-08-13 13:59:44 +0300 |
| commit | 6cc5ebf11ff6327720f41bbd0a0bd117d6b9edbf (patch) | |
| tree | 2114be87f36b0e9c7626708587ac6b60761455d9 /tools | |
| parent | 2cd4ae5ee6b385360644ded41d73e070ea81f116 (diff) | |
meson: Define all the rpath_dirs in one place
So they are located close to the definitions of the corresponding
install_dirs and can be reused easily.
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/meson.build | 32 |
1 files changed, 5 insertions, 27 deletions
diff --git a/tools/meson.build b/tools/meson.build index ae9ba493..e4517d66 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -49,32 +49,10 @@ if libdrm_intel.found() tool_deps += zlib endif -if get_option('use_rpath') - # Set up runpath for the test executables towards libigt.so. - # The path should be relative to $ORIGIN so the library is - # still found properly even if installed to a path other than - # prefix. - - # libdir and bindir are pathnames relative to prefix. meson - # enforces this. - - # Start from the executable - tools_rpathdir = '$ORIGIN' - # Executables are installed in bindir. Add a .. for each - # directory name in it. - foreach p : bindir.split('/') - tools_rpathdir = join_paths(tools_rpathdir, '..') - endforeach - # Add relative path to libdir - tools_rpathdir = join_paths(tools_rpathdir, libdir) -else - tools_rpathdir = '' -endif - foreach prog : tools_progs executable(prog, prog + '.c', dependencies : tool_deps, - install_rpath : tools_rpathdir, + install_rpath : bindir_rpathdir, install : true) endforeach @@ -85,21 +63,21 @@ if libudev.found() ] executable('intel_dp_compliance', sources : intel_dp_compliance_src, dependencies : [tool_deps, libudev], - install_rpath : tools_rpathdir, + install_rpath : bindir_rpathdir, install : true) endif intel_l3_parity_src = [ 'intel_l3_parity.c', 'intel_l3_udev_listener.c' ] executable('intel_l3_parity', sources : intel_l3_parity_src, dependencies : tool_deps, - install_rpath : tools_rpathdir, + install_rpath : bindir_rpathdir, install : true) intel_reg_src = [ 'intel_reg.c', 'intel_reg_decode.c', 'intel_reg_spec.c' ] executable('intel_reg', sources : intel_reg_src, dependencies : tool_deps, install : true, - install_rpath : tools_rpathdir, + install_rpath : bindir_rpathdir, c_args : [ '-DIGT_DATADIR="@0@"'.format(join_paths(prefix, datadir)), ]) @@ -118,7 +96,7 @@ shared_library('intel_aubdump', 'aubdump.c', executable('intel_gpu_top', 'intel_gpu_top.c', install : true, - install_rpath : tools_rpathdir, + install_rpath : bindir_rpathdir, dependencies : tool_deps + [ lib_igt_perf ]) conf_data = configuration_data() |