From c90f083614ea9a0e46a73b35e6f1e804cec5ae77 Mon Sep 17 00:00:00 2001 From: der richter Date: Sat, 30 Mar 2019 10:49:43 +0100 Subject: build: slightly adjust swift check output messages on fail to make it consistent with the other checks and their output messages. --- waftools/checks/custom.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'waftools/checks') diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 678232cf2b..fe0c079df1 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -114,9 +114,13 @@ def check_cocoa(ctx, dependency_identifier): return res def check_swift(ctx, dependency_identifier): + minVer = StrictVersion("3.0") if ctx.env.SWIFT_VERSION: - ctx.add_optional_message(dependency_identifier, - 'version found: ' + str(ctx.env.SWIFT_VERSION)) - if StrictVersion(ctx.env.SWIFT_VERSION) >= StrictVersion("3.0"): + if StrictVersion(ctx.env.SWIFT_VERSION) >= minVer: + ctx.add_optional_message(dependency_identifier, + 'version found: ' + str(ctx.env.SWIFT_VERSION)) return True + ctx.add_optional_message(dependency_identifier, + "'swift >= " + str(minVer) + "' not found, found " + + str(ctx.env.SWIFT_VERSION or None)) return False -- cgit v1.2.3