diff options
| author | emersion <contact@emersion.fr> | 2018-04-02 15:57:04 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-04-02 15:57:04 -0400 |
| commit | 8836b4f024f957971cae28a0fdc567ff16c8fbc8 (patch) | |
| tree | 23be1fc669c4fc721a521691ce182041cc7c5237 /meson.build | |
| parent | cadfccf1fde164646b175401a3fb1d3108b4af9a (diff) | |
| parent | d466cc117f95d34e239049a5af701b7ba696d336 (diff) | |
Merge branch 'master' into xwayland-dnd
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/meson.build b/meson.build index 7740b416..04c93817 100644 --- a/meson.build +++ b/meson.build @@ -82,35 +82,40 @@ if elogind.found() and get_option('enable_elogind') != 'false' endif if get_option('enable_x11_backend') or get_option('enable_xwayland') - xcb = dependency('xcb') - xcb_composite = dependency('xcb-composite') - xcb_xfixes = dependency('xcb-xfixes') - xcb_image = dependency('xcb-image') - xcb_render = dependency('xcb-render') - x11_xcb = dependency('x11-xcb') - - xcb_icccm = dependency('xcb-icccm', required: false) - xcb_errors = dependency('xcb-errors', required: get_option('enable_xcb_errors') == 'true') - - if xcb_icccm.found() - conf_data.set('WLR_HAS_XCB_ICCCM', true) - endif - - if xcb_errors.found() and get_option('enable_xcb_errors') != 'false' - conf_data.set('WLR_HAS_XCB_ERRORS', true) - endif - - wlr_deps += [ - xcb, - xcb_composite, - x11_xcb, - ] + xcb = dependency('xcb') + xcb_composite = dependency('xcb-composite') + xcb_xfixes = dependency('xcb-xfixes') + xcb_image = dependency('xcb-image') + xcb_render = dependency('xcb-render') + x11_xcb = dependency('x11-xcb') + + xcb_icccm = dependency('xcb-icccm', required: false) + xcb_xkb = dependency('xcb-xkb', required: false) + xcb_errors = dependency('xcb-errors', required: get_option('enable_xcb_errors') == 'true') + + if xcb_icccm.found() + conf_data.set('WLR_HAS_XCB_ICCCM', true) + endif + + if xcb_xkb.found() + conf_data.set('WLR_HAS_XCB_XKB', true) + endif + + if xcb_errors.found() and get_option('enable_xcb_errors') != 'false' + conf_data.set('WLR_HAS_XCB_ERRORS', true) + endif + + wlr_deps += [ + xcb, + xcb_composite, + x11_xcb, + ] else - add_project_arguments('-DMESA_EGL_NO_X11_HEADERS', language: 'c') + add_project_arguments('-DMESA_EGL_NO_X11_HEADERS', language: 'c') endif if get_option('enable_x11_backend') - conf_data.set('WLR_HAS_X11_BACKEND', true) + conf_data.set('WLR_HAS_X11_BACKEND', true) endif if get_option('enable_xwayland') |