Commit cce20942 authored by Christoph Haag's avatar Christoph Haag
Browse files

t/steamvr: Fix build on meson 0.61.0

Context: https://github.com/mesonbuild/meson/issues/4717
Using a directory directory as input in a custom_target was deprecated and printed the message
"This will become a hard error in the future."
It did become a hard error now.

Fixes error
../src/xrt/targets/steamvr_drv/meson.build:52:0: ERROR: File resources does not exist.
on meson 0.61.0
parent 2b456da5
Pipeline #481769 passed with stages
in 17 minutes and 53 seconds
......@@ -52,9 +52,8 @@ fake_driver_manifest = custom_target(
fake_driver_resources = custom_target(
'driver_resources_copy',
depends : driver_monado,
input : 'resources', # https://github.com/mesonbuild/meson/issues/4717
output : 'fake_driver_resources',
command : [copy_asset, 'DIRECTORY', '@INPUT@', resources_dir],
output : 'resources',
command : [copy_asset, 'DIRECTORY', join_paths(meson.current_source_dir(), 'resources'), resources_dir],
build_by_default : true
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment