Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-25 07:46:31 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-25 07:46:31 (GMT) |
| commit | 45cca954063503d0a30410c626e9b2c29acdf7e9 (patch) | |
| tree | a5b9033fc3823926ce33e183fa6f66615d749f8c /Swift | |
| parent | c49381c10da2a429d2d90b05dcfbdca13a2fc7e0 (diff) | |
| download | swift-45cca954063503d0a30410c626e9b2c29acdf7e9.zip swift-45cca954063503d0a30410c626e9b2c29acdf7e9.tar.bz2 | |
Require a configured TLS backend to build
Converted relevant SCons files from hard tabs to space based
indentation with 4 spaces width.
Test-Information:
Tested that build failed with misconfigured OpenSSL backend
(providing tls_backend=openssl on OS X and no information on
where to find it).
Tested that build succeeds on OS X 10.11.4.
Change-Id: I17f85ca3194f100f63361a8c94667d7aa76e811a
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/SConscript | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Swift/SConscript b/Swift/SConscript index bf19873..daff755 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -5,17 +5,13 @@ Import("env") SConscript("Controllers/SConscript") if env["SCONS_STAGE"] == "build" : - if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) and not env.get("HAVE_SECURETRANSPORT", 0): - print "Error: Swift requires OpenSSL support, and OpenSSL was not found." - if "Swift" in env["PROJECTS"] : - env["PROJECTS"].remove("Swift") - elif not GetOption("help") and not env.get("HAVE_QT", 0) : - if "Swift" in env["PROJECTS"] : - print "Warning: Swift requires Qt. Not building the Swift Qt application." - env["PROJECTS"].remove("Swift") - elif not GetOption("help") and env["target"] == "native" and "Swift" in env["PROJECTS"] : - try : - SConscript("QtUI/SConscript") - except Exception as e: - print "Warning: %s" % str(e) - env["PROJECTS"].remove("Swift") + if not GetOption("help") and not env.get("HAVE_QT", 0) : + if "Swift" in env["PROJECTS"] : + print "Warning: Swift requires Qt. Not building the Swift Qt application." + env["PROJECTS"].remove("Swift") + elif not GetOption("help") and env["target"] == "native" and "Swift" in env["PROJECTS"] : + try : + SConscript("QtUI/SConscript") + except Exception as e: + print "Warning: %s" % str(e) + env["PROJECTS"].remove("Swift") |