X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=218779df1876aae0e777bdc21a1a3cffc27af4af;hb=cec4cf8fe409cae5618e81e4a3b6dd11cc8b2aa9;hp=d953fe3f06e8b4cf340a5a76fdfc91d3fefeb930;hpb=e5016cbc47b46b86a50d9a6ca71269a62664efbe;p=src%2Fagl-compositor.git diff --git a/meson.build b/meson.build index d953fe3..218779d 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('agl-compositor', 'c','cpp', - version: '0.0.19', + version: '0.0.20', default_options: [ 'warning_level=3', 'c_std=gnu99', @@ -10,7 +10,6 @@ project('agl-compositor', ) config_h = configuration_data() -agl_compositor_version = '0.0.19' libweston_version = 'libweston-8' pkgconfig = import('pkgconfig') fs = import('fs') @@ -45,7 +44,7 @@ endforeach dep_libsystemd = dependency('libsystemd', required: false) dep_libsmack = dependency('libsmack', required: false) -dep_scanner = dependency('wayland-scanner', native: true) +dep_scanner = dependency('wayland-scanner') prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) dep_wp = dependency('wayland-protocols', version: '>= 1.18') dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir') @@ -70,7 +69,7 @@ endforeach # for it so we add waltham depends here. Further more, the output is being # handled by remoting plug-in depnames_waltham = [ - 'waltham' + 'waltham', 'waltham-transmitter', ] deps_waltham = [] @@ -279,9 +278,9 @@ exe_agl_compositor = executable( ) pkgconfig.generate( - filebase: 'agl-compositor-@0@-protocols'.format(agl_compositor_version), + filebase: 'agl-compositor-@0@-protocols'.format(meson.project_version()), name: 'agl-compositor private protocols', - version: agl_compositor_version, + version: meson.project_version(), description: 'agl-compositor protocol files', variables: [ 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),