meson: support installation tags
the only thing missing is to tag custom install targets, namely: - ICDs (vulkan, glvnd, OpenCL, VA-API, VDPAU) - Vulkan layers - custom install script for megadrivers - drirc file Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24911>
This commit is contained in:
parent
05e80e1a5e
commit
e3aab80d4f
21 changed files with 21 additions and 1 deletions
|
|
@ -255,6 +255,7 @@ radeon_icd = custom_target(
|
|||
command : icd_command,
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -166,6 +166,7 @@ broadcom_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -180,6 +180,7 @@ else
|
|||
input : 'main/50_mesa.json',
|
||||
output: '50_@0@.json'.format(glvnd_vendor_name),
|
||||
install : true,
|
||||
install_tag : 'runtime',
|
||||
install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d')
|
||||
)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -202,6 +202,7 @@ freedreno_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -143,4 +143,5 @@ meson.add_install_script(
|
|||
libgallium_dri.full_path(),
|
||||
dri_drivers_path,
|
||||
gallium_dri_drivers,
|
||||
install_tag : 'runtime',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ lvp_icd = custom_target(
|
|||
command : icd_command,
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@ if with_opencl_icd
|
|||
input : 'mesa.icd.in',
|
||||
output : 'mesa.icd',
|
||||
install : true,
|
||||
install_tag : 'runtime',
|
||||
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ configure_file(
|
|||
input : 'rusticl.icd.in',
|
||||
output : 'rusticl.icd',
|
||||
install : true,
|
||||
install_tag : 'runtime',
|
||||
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -116,5 +116,6 @@ else
|
|||
libva_gallium.full_path(),
|
||||
va_drivers_path,
|
||||
va_drivers,
|
||||
install_tag : 'runtime',
|
||||
)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -80,4 +80,5 @@ meson.add_install_script(
|
|||
libvdpau_gallium.full_path(),
|
||||
vdpau_drivers_path,
|
||||
vdpau_drivers,
|
||||
install_tag : 'runtime',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -165,6 +165,7 @@ powervr_mesa_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,4 +35,5 @@ vklayer_intel_nullhw = shared_library(
|
|||
install_data(
|
||||
files('VkLayer_INTEL_nullhw.json'),
|
||||
install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
|
||||
install_tag : 'runtime',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ intel_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ intel_hasvk_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ dzn_icd = custom_target(
|
|||
command : icd_command,
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ nouveau_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -152,6 +152,7 @@ panfrost_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ idep_mesautil = declare_dependency(
|
|||
|
||||
# Only install the drirc file if we build with support for parsing drirc files
|
||||
if use_xmlconfig
|
||||
install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d'))
|
||||
install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d'), install_tag : 'runtime')
|
||||
endif
|
||||
|
||||
xmlconfig_deps = []
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ virtio_icd = custom_target(
|
|||
],
|
||||
build_by_default : true,
|
||||
install_dir : with_vulkan_icd_dir,
|
||||
install_tag : 'runtime',
|
||||
install : true,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -53,4 +53,5 @@ vklayer_mesa_device_select = shared_library(
|
|||
install_data(
|
||||
files('VkLayer_MESA_device_select.json'),
|
||||
install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'),
|
||||
install_tag : 'runtime',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ vklayer_mesa_overlay = shared_library(
|
|||
install_data(
|
||||
files('VkLayer_MESA_overlay.json'),
|
||||
install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
|
||||
install_tag : 'runtime',
|
||||
)
|
||||
|
||||
install_data(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue