summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
5d4671c)
The version of meson in kirkstone doesn't yet have the "version" method
in output of find_program(), only in dependency(). The previous change
was too aggressive requiring too newer version of meson than what is
available in kirkstone, so restore the compatibility back.
Bug-AGL: SPEC-4578
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Change-Id: I14bc5ce114f24d0fac85a4eddac34277e46970a8
message('Found QtGui QPA header in ' + qpa_header_path)
endif
message('Found QtGui QPA header in ' + qpa_header_path)
endif
+dep_scanner = dependency('wayland-scanner')
prog_scanner = find_program('wayland-scanner')
agl_compositor_dep = dependency('agl-compositor-0.0.21-protocols')
dir_agl_compositor_base = agl_compositor_dep.get_variable(pkgconfig: 'pkgdatadir')
prog_scanner = find_program('wayland-scanner')
agl_compositor_dep = dependency('agl-compositor-0.0.21-protocols')
dir_agl_compositor_base = agl_compositor_dep.get_variable(pkgconfig: 'pkgdatadir')
output_file = '@0@-server-protocol.h'.format(base_file)
else
output_file = '@0@-protocol.c'.format(base_file)
output_file = '@0@-server-protocol.h'.format(base_file)
else
output_file = '@0@-protocol.c'.format(base_file)
- if prog_scanner.version().version_compare('< 1.14.91')
+ if dep_scanner.version().version_compare('< 1.14.91')
output_type = 'code'
endif
endif
output_type = 'code'
endif
endif