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

meson: Fix protocol includes for compositor examples 

(cherry picked from commit 70a084c119)
This commit is contained in:
Scott Anderson 2020-01-24 20:37:34 +13:00 committed by Simon Ser
parent 57ffb35de0
commit 422d9fdc4a
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/wayland/meson.build
View File

@ -16,5 +16,5 @@ client_protos = [
]
foreach proto : client_protos
wlr_files += get_variable(proto.underscorify() + '_h')
wlr_files += get_variable(proto.underscorify() + '_client_h')
endforeach

10
examples/meson.build
View File

@ -42,6 +42,7 @@ compositors = {
},
'fullscreen-shell': {
'src': 'fullscreen-shell.c',
'proto': ['fullscreen-shell-unstable-v1'],
},
}
@ -151,9 +152,14 @@ clients = {
}
foreach name, info : compositors
extra_src = []
foreach p : info.get('proto', [])
extra_src += get_variable(p.underscorify() + '_server_h')
endforeach
executable(
name,
info.get('src'),
[info.get('src'), extra_src],
dependencies: wlroots,
include_directories: [wlr_inc, proto_inc],
build_by_default: get_option('examples'),
@ -164,7 +170,7 @@ foreach name, info : clients
extra_src = []
foreach p : info.get('proto')
extra_src += get_variable(p.underscorify() + '_c')
extra_src += get_variable(p.underscorify() + '_h')
extra_src += get_variable(p.underscorify() + '_client_h')
endforeach
executable(

8
protocol/meson.build
View File

@ -53,14 +53,15 @@ foreach name, path : protocols
)
wlr_files += code
wlr_files += custom_target(
server_header = custom_target(
name.underscorify() + '_server_h',
input: path,
output: '@BASENAME@-protocol.h',
command: [wayland_scanner, 'server-header', '@INPUT@', '@OUTPUT@'],
)
wlr_files += server_header
header = custom_target(
client_header = custom_target(
name.underscorify() + '_client_h',
input: path,
output: '@BASENAME@-client-protocol.h',
@ -69,5 +70,6 @@ foreach name, path : protocols
)
set_variable(name.underscorify() + '_c', code)
set_variable(name.underscorify() + '_h', header)
set_variable(name.underscorify() + '_server_h', server_header)
set_variable(name.underscorify() + '_client_h', client_header)
endforeach