Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-29 17:25:57 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-29 17:25:57 (GMT) |
| commit | 420654a8e323beb7c8877453393568240a3f2a07 (patch) | |
| tree | e91315b547e4c3ae6e45f18556bb291d29fc1c3e | |
| parent | 449686ae3a8b6ad059a7c905387adaca40e9e8e8 (diff) | |
| download | swift-420654a8e323beb7c8877453393568240a3f2a07.zip swift-420654a8e323beb7c8877453393568240a3f2a07.tar.bz2 | |
Make Qt non-mandatory for global build.
| -rw-r--r-- | BuildTools/SCons/SConstruct | 8 | ||||
| -rw-r--r-- | Swift/SConscript | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index e241746..11bd0b1 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -527,6 +527,14 @@ if env["PLATFORM"] == "darwin" : env["HAVE_IOKIT"] = True cocoa_conf.Finish() +# Qt +try : + myenv = env.Clone() + myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"]) + env["HAVE_QT"] = True +except : + env["HAVE_QT"] = False + ################################################################################ # DocBook setup ################################################################################ diff --git a/Swift/SConscript b/Swift/SConscript index 0064eee..ee0140c 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -7,7 +7,9 @@ SConscript("Controllers/SConscript") if env["SCONS_STAGE"] == "build" : if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) : print "Error: Swift requires OpenSSL support, and OpenSSL was not found." - Exit(1) - - if env["target"] == "native": + env["PROJECTS"].remove("Swift") + elif not GetOption("help") and not env.get("HAVE_QT", 0) : + print "Error: Swift requires Qt. Not building Swift." + env["PROJECTS"].remove("Swift") + elif env["target"] == "native": SConscript("QtUI/SConscript") |