summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2018-02-08 17:22:14 +0000
committerTim-Philipp Müller <tim@centricular.com>2018-02-08 17:22:14 +0000
commit24f9c2dcb325fa00a0aa297c7b9af869df123446 (patch)
treec031cc9d94e6411148acba1fcd0bc18476e0b733
parentffa4dc4dce8c44f372b361ef00fb7715eb5cbb87 (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.
-rw-r--r--meson.build8
1 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 642b60cef..88551713e 100644
--- a/meson.build
+++ b/meson.build
@@ -6,9 +6,9 @@ project('gstreamer', '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].to_int()
else
@@ -21,7 +21,7 @@ apiversion = '1.0'
soversion = 0
# maintaining compatibility with the previous libtool versioning
# current = minor * 100 + micro
-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)
prefix = get_option('prefix')
libtype = get_option('library_format')