hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 03:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1208 from arandomhuman/master

Browse source 
Fixes examples/dmabuf-capture being built with unmet dependencies
This commit is contained in:
Drew DeVault 2018-08-30 14:29:13 -04:00 committed by GitHub
commit 2f48453718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/meson.build
View file

@ -20,31 +20,31 @@ endif
examples = { examples = {
'simple': { 'simple': {
'src': 'simple.c', 'src': 'simple.c',
'dep': wlroots, 'dep': [wlroots],
}, },
'pointer': { 'pointer': {
'src': 'pointer.c', 'src': 'pointer.c',
'dep': wlroots, 'dep': [wlroots],
}, },
'touch': { 'touch': {
'src': ['touch.c', 'cat.c'], 'src': ['touch.c', 'cat.c'],
'dep': wlroots, 'dep': [wlroots],
}, },
'tablet': { 'tablet': {
'src': 'tablet.c', 'src': 'tablet.c',
'dep': wlroots, 'dep': [wlroots],
}, },
'rotation': { 'rotation': {
'src': ['rotation.c', 'cat.c'], 'src': ['rotation.c', 'cat.c'],
'dep': wlroots, 'dep': [wlroots],
}, },
'multi-pointer': { 'multi-pointer': {
'src': 'multi-pointer.c', 'src': 'multi-pointer.c',
'dep': wlroots, 'dep': [wlroots],
}, },
'output-layout': { 'output-layout': {
'src': ['output-layout.c', 'cat.c'], 'src': ['output-layout.c', 'cat.c'],
'dep': wlroots, 'dep': [wlroots],
}, },
'screenshot': { 'screenshot': {
'src': 'screenshot.c', 'src': 'screenshot.c',
@ -93,10 +93,18 @@ examples = {
} }
foreach name, info : examples foreach name, info : examples
all_dep_found = true
foreach d : info.get('dep')
all_dep_found = all_dep_found and d.found()
endforeach
if all_dep_found
executable( executable(
name, name,
info.get('src'), info.get('src'),
dependencies: info.get('dep'), dependencies: info.get('dep'),
build_by_default: get_option('examples'), build_by_default: get_option('examples'),
) )
else
warning('Dependencies not satisfied for ' + name)
endif
endforeach endforeach