Upgrade google-fruit to 1aa1f56a1b9c2cf81876e463c5abd5c2356c8ee0
Test: None
Change-Id: I010528c657f84486c93c18463dfb9c3680891c93
diff --git a/METADATA b/METADATA
index ebe37d6..3ef086a 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@
type: GIT
value: "https://github.com/google/fruit.git"
}
- version: "d1608a5732fc44e29a067e4b578888d0ec32291d"
+ version: "1aa1f56a1b9c2cf81876e463c5abd5c2356c8ee0"
license_type: NOTICE
last_upgrade_date {
year: 2019
- month: 5
+ month: 6
day: 2
}
}
diff --git a/conanfile.py b/conanfile.py
index e5419a9..46bd1ce 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -19,15 +19,15 @@
def configure(self):
min_version = {
- "gcc": "5",
- "clang": "3.5",
- "apple-clang": "7.3",
- "Visual Studio": "14", # MSVC 2015
+ "gcc": 5,
+ "clang": 3.5,
+ "apple-clang": 7.3,
+ "Visual Studio": 14, # MSVC 2015
}.get(str(self.settings.compiler))
if not min_version:
# Unknown minimum version, let's try going ahead with the build to see if it works.
return
- if str(self.settings.compiler.version) < min_version:
+ if float(str(self.settings.compiler.version)) < min_version:
raise ConanException("%s %s is not supported, must be at least %s" % (self.settings.compiler,
self.settings.compiler.version,
min_version))
