Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-02-11 14:26:06 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-02-15 12:08:47 (GMT) |
| commit | 368781877e8fa91b0cdec868b0fb9a427c636ba9 (patch) | |
| tree | 39dcfd705a6d9617fb6e546d8df895020f4065d2 /BuildTools/SCons | |
| parent | 44a4e7616195ee6fec3ca9f05ae690aafdce2470 (diff) | |
| download | swift-368781877e8fa91b0cdec868b0fb9a427c636ba9.zip swift-368781877e8fa91b0cdec868b0fb9a427c636ba9.tar.bz2 | |
Improve SCons reporting on missing Qt tools
This will print errors like missing Qt linguist tools.
Test-Information:
Tested on Fedora 22 and OS X 10.11.3.
Change-Id: I0817f368920b839805597d8eb2f3297b1fbd90e6
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 16f1953..ac4d003 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -613,7 +613,10 @@ try : myenv = env.Clone() myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) env["HAVE_QT"] = True -except : +except SCons.Errors.StopError: + env["HAVE_QT"] = False +except Exception as e: + print "Info: %s" % str(e) env["HAVE_QT"] = False ################################################################################ |