OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: fix wayland-less builds

Browse Source 
Those empty variables in the !wayland case are useless and running that
meson.build with them breaks the build:

  [287/850] Generating wayland-drm-client-protocol.h with a custom command.
  FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  /bin/sh: client-header: command not found
  ninja: build stopped: subcommand failed.

Fixes: d1992255bb "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Eric Engestrom
2018-10-11 16:00:04 +01:00
parent 7df80de6e6
commit 4fa2fb3524
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@@ -1318,13 +1318,6 @@ if with_platform_wayland
'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml' 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
) )
pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED'] pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
else
prog_wl_scanner = []
wl_scanner_arg = ''
dep_wl_protocols = null_dep
dep_wayland_client = null_dep
dep_wayland_server = null_dep
wayland_dmabuf_xml = ''
endif endif
dep_x11 = null_dep dep_x11 = null_dep

4
src/meson.build
View File

@@ -51,7 +51,9 @@ subdir('util')
subdir('mapi') subdir('mapi')
# TODO: opengl # TODO: opengl
subdir('compiler') subdir('compiler')
subdir('egl/wayland/wayland-drm') if with_platform_wayland
subdir('egl/wayland/wayland-drm')
endif
if with_any_vk if with_any_vk
subdir('vulkan') subdir('vulkan')
endif endif