Fix android sdk's cmake version autodetect

StrictVersion was failing with 3.10.4988404. Use LooseVersion instead.
This commit is contained in:
Ignacio Etcheverry 2019-07-08 15:27:27 +02:00
parent 5ff3e54b84
commit 9efec19e6b

View File

@ -114,7 +114,7 @@ class AndroidTargetInfo:
def android_autodetect_cmake(): def android_autodetect_cmake():
from distutils.version import StrictVersion from distutils.version import LooseVersion
from os import listdir from os import listdir
sdk_cmake_basedir = path_join(ANDROID_SDK_ROOT, 'cmake') sdk_cmake_basedir = path_join(ANDROID_SDK_ROOT, 'cmake')
@ -123,7 +123,7 @@ def android_autodetect_cmake():
for entry in listdir(sdk_cmake_basedir): for entry in listdir(sdk_cmake_basedir):
if isdir(path_join(sdk_cmake_basedir, entry)): if isdir(path_join(sdk_cmake_basedir, entry)):
try: try:
version = StrictVersion(entry) version = LooseVersion(entry)
versions += [version] versions += [version]
except ValueError: except ValueError:
continue # Not a version folder continue # Not a version folder