Merge pull request #1546 from antmicro/fix_meson_version_check
builder: Fix logic for determining meson version compatibility
This commit is contained in:
commit
01a4ea169c
|
@ -262,7 +262,7 @@ class Builder:
|
||||||
msg = "Unable to find valid Meson build system, please install it with:\n"
|
msg = "Unable to find valid Meson build system, please install it with:\n"
|
||||||
msg += "- pip3 install meson.\n"
|
msg += "- pip3 install meson.\n"
|
||||||
raise OSError(msg)
|
raise OSError(msg)
|
||||||
if (int(meson_version[0]) < meson_major_min) or (int(meson_version[1]) < meson_minor_min):
|
if (int(meson_version[0]) < meson_major_min) or (int(meson_version[0]) == meson_major_min and int(meson_version[1]) < meson_minor_min):
|
||||||
msg = f"Meson version to old. Found: {meson_version[0]}.{meson_version[1]}. Required: {meson_major_min}.{meson_minor_min}.\n"
|
msg = f"Meson version to old. Found: {meson_version[0]}.{meson_version[1]}. Required: {meson_major_min}.{meson_minor_min}.\n"
|
||||||
msg += "Try updating with:\n"
|
msg += "Try updating with:\n"
|
||||||
msg += "- pip3 install -U meson.\n"
|
msg += "- pip3 install -U meson.\n"
|
||||||
|
|
Loading…
Reference in New Issue