meson: better error for wayland-backend wl-egl dep

Helps people avoid wayland-egl if they don't want it.

Makes the check for wayland-egl explicit on the site instead of relying
on gl-renderer checking for it.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
dev
Pekka Paalanen 6 years ago
parent 4da8141255
commit 43a42920cf
  1. 6
      libweston/meson.build
  2. 1
      meson.build

@ -309,7 +309,11 @@ if get_option('backend-wayland')
] ]
if get_option('renderer-gl') if get_option('renderer-gl')
deps_wlwl += dep_wl_egl d = dependency('wayland-egl', required: false)
if not d.found()
error('wayland-backend + gl-renderer requires wayland-egl which was not found. Or, you can use \'-Dbackend-wayland=false\' or \'-Drenderer-gl=false\'.')
endif
deps_wlwl += d
endif endif
plugin_wlwl = shared_library( plugin_wlwl = shared_library(

@ -154,7 +154,6 @@ dep_libm = cc.find_library('m')
dep_libdl = cc.find_library('dl') dep_libdl = cc.find_library('dl')
dep_libdrm = dependency('libdrm', version: '>= 2.4.68') dep_libdrm = dependency('libdrm', version: '>= 2.4.68')
dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true) dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true)
dep_wl_egl = dependency('wayland-egl')
dep_threads = dependency('threads') dep_threads = dependency('threads')
subdir('protocol') subdir('protocol')

Loading…
Cancel
Save