fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 00:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan-overlay/meson: use install_data instead of configure_file

Browse source 
We don't want to copy the file into the build directory, we want to
install it. That's what install_data is for.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2924
Fixes: 56ccea58ae
       ("vulkan/overlay: Add basic overlay control script.")

Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4740>
(cherry picked from commit fb62e642ae)
This commit is contained in:
Dylan Baker 2020-05-20 18:00:14 -07:00
parent 41092aa008
commit 765a7d3207
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2290,7 +2290,7 @@
"description": "vulkan-overlay/meson: use install_data instead of configure_file",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "56ccea58ae7f6fd56cf4a1697d2cceb68866b552"
},

9
src/vulkan/overlay-layer/meson.build
View file

@ -52,9 +52,8 @@ install_data(
install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
)
configure_file(
input : files('mesa-overlay-control.py'),
output : '@PLAINNAME@',
configuration : configuration_data(), # only copy the file
install_dir: get_option('bindir'),
install_data(
'mesa-overlay-control.py',
install_dir : get_option('bindir'),
install_mode : 'r-xr-xr-x',
)