hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 13:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

moved wlroots/xwayland definitions to the main meson file

Browse source 
prevents build-failure when xwayland is disabled to to
    add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
beeing called after the required wayland protocols have been built.
This commit is contained in:
Florian "sp1rit"​ 2022-06-14 11:19:03 +02:00
parent b3ef1fcc54
commit c169f94895
No known key found for this signature in database
GPG key ID: BA579378AC81FB05
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -2,6 +2,19 @@ project('Hyprland', 'cpp', 'c',
version : '0.1', version : '0.1',
default_options : ['warning_level=3', 'cpp_std=c++20']) default_options : ['warning_level=3', 'cpp_std=c++20'])
wlroots = subproject('wlroots', default_options: ['examples=false'])
have_xwlr = wlroots.get_variable('features').get('xwayland')
xcb_dep = dependency('xcb', required: get_option('xwayland'))
if get_option('xwayland').enabled() and not have_xwlr
error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
endif
have_xwayland = xcb_dep.found() and have_xwlr
if not have_xwayland
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
endif
subdir('protocols') subdir('protocols')
subdir('src') subdir('src')
subdir('hyprctl') subdir('hyprctl')

13
src/meson.build
View file

@ -1,19 +1,6 @@
globber = run_command('find', '-name', '*.cpp', check: true) globber = run_command('find', '-name', '*.cpp', check: true)
src = globber.stdout().strip().split('\n') src = globber.stdout().strip().split('\n')
wlroots = subproject('wlroots', default_options: ['examples=false'])
have_xwlr = wlroots.get_variable('features').get('xwayland')
xcb_dep = dependency('xcb', required: get_option('xwayland'))
if get_option('xwayland').enabled() and not have_xwlr
error('Cannot enable Xwayland in Hyperland: wlroots has been built without Xwayland support')
endif
have_xwayland = xcb_dep.found() and have_xwlr
if not have_xwayland
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
endif
executable('Hyprland', src, executable('Hyprland', src,
cpp_args: ['-DWLR_USE_UNSTABLE'], cpp_args: ['-DWLR_USE_UNSTABLE'],
dependencies: [ dependencies: [