I didn't add these since I didn't know if they'd be useful given that meson doesn't generate a <builddir>/lib, but this looks correct.
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Quoting Bas Nieuwenhuizen (2017-10-05 12:34:51)
> ---
> src/amd/vulkan/Makefile.am | 2 +-
> src/amd/vulkan/dev_icd.json.in | 2 +-
> src/amd/vulkan/meson.build | 7 +++++++
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
> index 438872bbb48..19ec3f47f74 100644
> --- a/src/amd/vulkan/Makefile.am
> +++ b/src/amd/vulkan/Makefile.am
> @@ -149,7 +149,7 @@ noinst_DATA = dev_icd.json
>
> dev_icd.json : dev_icd.json.in
> $(AM_V_GEN) $(SED) \
> - -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
> + -e
> "s#@libvulkan_radeon_path@#${abs_top_builddir}/${LIB_DIR}/libvulkan_radeon.so#"
> \
> < $(srcdir)/dev_icd.json.in > $@
>
> radeon_icd.@host_cpu@.json : radeon_icd.json.in
> diff --git a/src/amd/vulkan/dev_icd.json.in b/src/amd/vulkan/dev_icd.json.in
> index f726df02ad1..cc80641f584 100644
> --- a/src/amd/vulkan/dev_icd.json.in
> +++ b/src/amd/vulkan/dev_icd.json.in
> @@ -1,7 +1,7 @@
> {
> "file_format_version": "1.0.0",
> "ICD": {
> - "library_path": "@build_libdir@/libvulkan_radeon.so",
> + "library_path": "@libvulkan_radeon_path@",
> "api_version": "1.0.3"
> }
> }
> diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
> index 02a2703a5c1..a5a4f813528 100644
> --- a/src/amd/vulkan/meson.build
> +++ b/src/amd/vulkan/meson.build
> @@ -116,9 +116,16 @@ libvulkan_radeon = shared_library(
>
> radv_data = configuration_data()
> radv_data.set('install_libdir', join_paths(get_option('prefix'),
> get_option('libdir')))
> +radv_data.set('libvulkan_radeon_path', libvulkan_radeon.full_path())
> +
> configure_file(
> configuration : radv_data,
> input : 'radeon_icd.json.in',
> output : 'radeon_icd.@0@.json'.format(target_machine.cpu()),
> install_dir : with_vulkan_icd_dir,
> )
> +configure_file(
> + configuration : radv_data,
> + input : 'dev_icd.json.in',
> + output : 'dev_icd.json'
> +)
> --
> 2.14.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
