diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-03-17 16:35:17 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-03-17 17:41:35 +0100 |
| commit | dbd81bbb89ae91334fb2e608e6860ed0055d1915 (patch) | |
| tree | 810511bae3e3f95b3a9db73cebbcf31644a907c7 /meson.build | |
| parent | 3f8f6826ac012f82a7c80beccc0240eac053f403 (diff) | |
| download | slirp-dbd81bbb89ae91334fb2e608e6860ed0055d1915.zip slirp-dbd81bbb89ae91334fb2e608e6860ed0055d1915.tar.gz slirp-dbd81bbb89ae91334fb2e608e6860ed0055d1915.tar.bz2 | |
Teach slirp_version_string() to return vcs version
Meson build will use a vcs-generate version, while Makefile will
always use -git version, since it is only intended for submodule
usage. Eventually can be improved if needed.
Fixes:
https://gitlab.freedesktop.org/slirp/libslirp/issues/17
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meson.build b/meson.build index df0d26f..098bb6f 100644 --- a/meson.build +++ b/meson.build @@ -1,9 +1,11 @@ project('libslirp', 'c', - version : '4.2.0', + version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check : true).stdout().strip(), license : 'BSD-3-Clause', default_options : ['warning_level=1', 'c_std=gnu99'] ) +meson.add_dist_script('build-aux/meson-dist', meson.project_version(), meson.source_root()) + version = meson.project_version() varr = version.split('.') major_version = varr[0] @@ -14,6 +16,7 @@ conf = configuration_data() conf.set('SLIRP_MAJOR_VERSION', major_version) conf.set('SLIRP_MINOR_VERSION', minor_version) conf.set('SLIRP_MICRO_VERSION', micro_version) +conf.set_quoted('SLIRP_VERSION_STRING', version) # libtool versioning - this applies to libslirp # |