Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-10 08:45:48 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-10-16 11:22:17 (GMT) |
| commit | f5b5f35868b3f1fd93906d6458cca965f12c6a5f (patch) | |
| tree | 5c87e9217cc6d4e7a2b1d04b696b5f2d7c794daf /Swift | |
| parent | 3a2b966711dbe6fa937c485d7ad56916219badb2 (diff) | |
| download | swift-f5b5f35868b3f1fd93906d6458cca965f12c6a5f.zip swift-f5b5f35868b3f1fd93906d6458cca965f12c6a5f.tar.bz2 | |
Do not require complete Qt installation when building Swiften
Previously, if a base installation of Qt was available but not
all Qt modules required by Swift are available Scons would fail
configuration. If a basic Qt installation is available SCons will
try to configure Swift even if you only want to build Swiften.
This commit changes the hard failure in Swift configuration to a
warning. This allows only Swiften to be build.
In addition, the warning now lists the Qt packages required by
Swift.
Test-Information:
Tested on Arch Linux.
Change-Id: I220ea61a7e4af849912e1fb1ae66cbecf5136d29
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/SConscript | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Swift/SConscript b/Swift/SConscript index 566019c..31b0b94 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -13,5 +13,9 @@ if env["SCONS_STAGE"] == "build" : 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": - SConscript("QtUI/SConscript") + 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") |