blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1208 from arandomhuman/master 

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
parent 633663cdde 660a022909
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 = {
'simple': {
'src': 'simple.c',
'dep': wlroots,
'dep': [wlroots],
},
'pointer': {
'src': 'pointer.c',
'dep': wlroots,
'dep': [wlroots],
},
'touch': {
'src': ['touch.c', 'cat.c'],
'dep': wlroots,
'dep': [wlroots],
},
'tablet': {
'src': 'tablet.c',
'dep': wlroots,
'dep': [wlroots],
},
'rotation': {
'src': ['rotation.c', 'cat.c'],
'dep': wlroots,
'dep': [wlroots],
},
'multi-pointer': {
'src': 'multi-pointer.c',
'dep': wlroots,
'dep': [wlroots],
},
'output-layout': {
'src': ['output-layout.c', 'cat.c'],
'dep': wlroots,
'dep': [wlroots],
},
'screenshot': {
'src': 'screenshot.c',
@ -93,10 +93,18 @@ 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(
name,
info.get('src'),
dependencies: info.get('dep'),
build_by_default: get_option('examples'),
)
else
warning('Dependencies not satisfied for ' + name)
endif
endforeach