diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-21 18:56:22 +0100 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-21 19:02:56 +0100 |
| commit | d6af20c63775070df7dc917001ae2be3dffc51ff (patch) | |
| tree | 00b38b8d641a62b4f63484f07150bc0c70812f2d | |
| parent | 26d3103213dcd29fd5050a20f73ecee50771f013 (diff) | |
| download | libchamplain-d6af20c63775070df7dc917001ae2be3dffc51ff.tar.gz | |
meson: Fix building api_version with odd minor
`version_minor + 1` only works if version_minor is an int.
| -rw-r--r-- | meson.build | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 3bdd0b5..47cddc7 100644 --- a/meson.build +++ b/meson.build @@ -14,15 +14,14 @@ pkg = import('pkgconfig') # Versioning version = meson.project_version() version_arr = version.split('.') -version_major = version_arr[0] -version_minor = version_arr[1] -version_micro = version_arr[2] - -if version_minor.to_int().is_odd() - api_version = '.'.join([version_major, version_minor + 1]) -else - api_version = '.'.join([version_major, version_minor]) -endif +version_major = version_arr[0].to_int() +version_minor = version_arr[1].to_int() +version_micro = version_arr[2].to_int() + +api_version = '@0@.@1@'.format( + version_major, + version_minor.is_odd() ? version_minor + 1 : version_minor, +) # Before making a release, the LT_VERSION string should be modified. # The string is of the form C.A.R |