summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BuildTools/SCons/Tools/qt4.py2
-rw-r--r--Swift/SConscript8
2 files changed, 7 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 6c54b1e..6d9285c 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -517,7 +517,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
ret = test_conf.TryAction('pkg-config --exists \'%s\'' % modules_str)[0]
if ret != 1:
test_conf.Finish()
- raise Exception("Qt has not been found using pkg-config.")
+ raise Exception('Qt installation is missing packages. The following are required: %s' % modules_str)
return
test_conf.env.ParseConfig("pkg-config --cflags --libs " + modules_str)
self.AppendUnique(LIBS=test_conf.env["LIBS"], LIBPATH=test_conf.env["LIBPATH"], CPPPATH=test_conf.env["CPPPATH"])
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")