diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-02-08 17:17:51 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-02-08 17:18:32 +0000 |
| commit | 5b970a75fa3b99906245b8cfc71cafc049c6ef4b (patch) | |
| tree | a1647700f53ee5e8da87e514fe6c122e8d0ec8fd /meson.build | |
| parent | 992fb96843cd06a5fd066e296db8b6099a72a9a0 (diff) | |
meson: make version numbers ints and fix int/string comparison
WARNING: Trying to compare values of different types (str, int).
The result of this is undefined and will become a hard error
in a future Meson release.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 86fa61c746..7e8c8fcca6 100644 --- a/meson.build +++ b/meson.build @@ -6,11 +6,11 @@ project('gst-plugins-base', 'c', gst_version = meson.project_version() version_arr = gst_version.split('.') -gst_version_major = version_arr[0] -gst_version_minor = version_arr[1] -gst_version_micro = version_arr[2] +gst_version_major = version_arr[0].to_int() +gst_version_minor = version_arr[1].to_int() +gst_version_micro = version_arr[2].to_int() if version_arr.length() == 4 - gst_version_nano = version_arr[3] + gst_version_nano = version_arr[3].to_int() else gst_version_nano = 0 endif @@ -26,7 +26,7 @@ soversion = 0 # maintaining compatibility with the previous libtool versioning # current = minor * 100 + micro # FIXME: should be able to convert string to int somehow so we can just do maths -libversion = '@0@.@1@.0'.format(soversion, gst_version_minor.to_int() * 100 + gst_version_micro.to_int()) +libversion = '@0@.@1@.0'.format(soversion, gst_version_minor * 100 + gst_version_micro) plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) |