vulkan-overlay/meson: use install_data instead of configure_file
authorDylan Baker <dylan.c.baker@intel.com>
Thu, 21 May 2020 01:00:14 +0000 (18:00 -0700)
committerMarge Bot <eric+marge@anholt.net>
Mon, 1 Jun 2020 18:59:18 +0000 (18:59 +0000)
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: 56ccea58ae7f6fd56cf4a1697d2cceb68866b552
       ("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>

src/vulkan/overlay-layer/meson.build

index 37fd7a3412adebfad0c3517a9c7f7ce3a5797a3e..19856f66d259ab3a4a44dac0281ed099ba088a5d 100644 (file)
@@ -53,9 +53,8 @@ install_data(
   install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'),
 )
 
   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',
 )
 )