Merge pull request #1208 from arandomhuman/master
Fixes examples/dmabuf-capture being built with unmet dependencies
This commit is contained in:
commit
2f48453718
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue