diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2017-10-05 21:31:29 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2017-10-05 23:46:21 +0200 |
| commit | 908a25ecb0a2f435d3882a4f1849140df562e32a (patch) | |
| tree | 854895b95b007a42cb042a0ae66fa2c256d24a07 | |
| parent | 18bdf73556440ca2eaac2d22e1e3ebe1be7b6c1d (diff) | |
meson: generate builddir/src/amd/vulkan/dev_icd.json
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | src/amd/vulkan/Makefile.am | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/dev_icd.json.in | 2 | ||||
| -rw-r--r-- | 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.@[email protected] : 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.@[email protected]'.format(target_machine.cpu()), install_dir : with_vulkan_icd_dir, ) +configure_file( + configuration : radv_data, + input : 'dev_icd.json.in', + output : 'dev_icd.json' +) |