From 5a9add1fb3370b086f2c32e4b996218ae898b529 Mon Sep 17 00:00:00 2001 From: Akemi Date: Sun, 8 Jul 2018 17:05:13 +0200 Subject: add swift as main dependency so all dependencies can be disabled easily (cherry picked from commit 5c2056ad0a43b1d15baef6d289aff8cacadad053) --- waftools/checks/custom.py | 2 ++ wscript | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 1cb133f27c..821bf9c46f 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -115,6 +115,8 @@ def check_cocoa(ctx, dependency_identifier): def check_swift(ctx, dependency_identifier): if ctx.env.SWIFT_VERSION: major = int(ctx.env.SWIFT_VERSION.split('.')[0]) + ctx.add_optional_message(dependency_identifier, + 'version found: ' + ctx.env.SWIFT_VERSION) if major >= 3: return True return False diff --git a/wscript b/wscript index 73a891f28c..e9e0ab3672 100644 --- a/wscript +++ b/wscript @@ -168,6 +168,11 @@ main_dependencies = [ 'req': True, 'fmsg': 'Unable to find either POSIX or MinGW-w64 environment, ' \ 'or compiler does not work.', + }, { + 'name': '--swift', + 'desc': 'macOS Swift build tools', + 'deps': 'os-darwin', + 'func': check_swift, }, { 'name': '--uwp', 'desc': 'Universal Windows Platform', @@ -912,8 +917,8 @@ standalone_features = [ }, { 'name': '--macos-cocoa-cb', 'desc': 'macOS opengl-cb backend', - 'deps': 'cocoa', - 'func': check_swift + 'deps': 'cocoa && swift', + 'func': check_true } ] -- cgit v1.2.3