colin/rofi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Build] Use auto-option for enabling/disabling wayland/xcb

Browse Source
This commit is contained in:
Qball
2025-05-28 23:14:01 +02:00
parent 88dc74c028
commit faa6a2311c
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meson.build
View File

@@ -66,15 +66,26 @@ deps = [
dep_lm, dep_lm,
] ]
xcb_enabled = get_option('xcb').enabled()
wayland_enabled = get_option('wayland').enabled()
assert(xcb_enabled or wayland_enabled,
'At least one of these options must be enabled: wayland, xcb')
libgwater = subproject('libgwater') libgwater = subproject('libgwater')
xcb = dependency('xcb', required: xcb_enabled ) ##
# Check if atleast xcb or wayland is allowed in build configuration.
# No point in having no backend.
##
xcb_allowed= get_option('xcb').allowed()
wayland_allowed = get_option('wayland').allowed()
assert(xcb_allowed or wayland_allowed,
'At least one of these options must be allowed: wayland, xcb')
##
# Check what two options should be available.
##
xcb = dependency('xcb', required: get_option('xcb').enabled())
wayland_protocols = dependency('wayland-protocols', version: '>= 1.17', required: get_option('wayland').enabled())
xcb_enabled = xcb.found()
wayland_enabled = wayland_protocols.found()
# XCB stuff # XCB stuff
if xcb_enabled if xcb_enabled
deps += [ deps += [
@@ -94,7 +105,6 @@ if xcb_enabled
] ]
endif endif
wayland_protocols = dependency('wayland-protocols', version: '>= 1.17', required: wayland_enabled)
if wayland_enabled if wayland_enabled
deps += [ deps += [
@@ -105,6 +115,13 @@ if wayland_enabled
] ]
endif endif
##
# If both in auto mode, but none found. Check again if atleast one exists.
##
assert(xcb_enabled or wayland_enabled,
'At least one of these options must be found: wayland, xcb')
header_conf = configuration_data() header_conf = configuration_data()
if get_option('imdkit') if get_option('imdkit')
imdkit_new = dependency('xcb-imdkit', version: '>= 1.0.3', required: false) imdkit_new = dependency('xcb-imdkit', version: '>= 1.0.3', required: false)

4
meson_options.txt
View File

@@ -2,5 +2,5 @@ option('drun', type: 'boolean', value: true, description: 'Desktop file mode')
option('window', type: 'boolean', value: true, description: 'Window switcher mode') option('window', type: 'boolean', value: true, description: 'Window switcher mode')
option('check', type: 'feature', description: 'Build and run libcheck-based tests') option('check', type: 'feature', description: 'Build and run libcheck-based tests')
option('imdkit', type: 'boolean', value: true, description: 'IMDKit support') option('imdkit', type: 'boolean', value: true, description: 'IMDKit support')
option('wayland', type: 'feature', value: 'enabled', description: 'Build with wayland support') option('wayland', type: 'feature', value: 'auto', description: 'Build with wayland support')
option('xcb', type: 'feature', value: 'enabled', description: 'Build with X11/xcb support') option('xcb', type: 'feature', value: 'auto', description: 'Build with X11/xcb support')