Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-11 17:29:21 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-11 17:29:21 (GMT) |
| commit | a6104246c55cd567d67fb512098ff80d25dc8837 (patch) | |
| tree | f8489f2c5a6dd4194a9261610b9001fab2ac2b7c | |
| parent | d07a31cc74304b942a320f5d17330e83c17e152a (diff) | |
| download | swift-a6104246c55cd567d67fb512098ff80d25dc8837.zip swift-a6104246c55cd567d67fb512098ff80d25dc8837.tar.bz2 | |
Add Qt scons variable.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 3rdParty/Expat/SConscript | 2 | ||||
| -rw-r--r-- | SConstruct | 6 | ||||
| -rw-r--r-- | Swift/SConscript | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -23,6 +23,7 @@ moc_* qrc_* ui_* +config.py checker aclocal.m4 autom4te.cache diff --git a/3rdParty/Expat/SConscript b/3rdParty/Expat/SConscript index 8220f01..3e3b751 100644 --- a/3rdParty/Expat/SConscript +++ b/3rdParty/Expat/SConscript @@ -1,4 +1,4 @@ -Import(["env", "conf_env") +Import(["env", "conf_env"]) env["EXPAT_FLAGS"] = { "CPPDEFINES": ["XML_STATIC"], @@ -14,6 +14,7 @@ if os.name != "nt" : if os.name == "mac" : vars.Add(BoolVariable("universal", "Create universal binaries", "no")) vars.Add(PackageVariable("openssl", "OpenSSL location", "yes")) +vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept)) ################################################################################ # Set up default build & configure environment @@ -141,6 +142,7 @@ if conf.CheckCHeader("expat.h") and conf.CheckLib("expat") : conf.Finish() +# Bundled expat bundledExpat = False if not env.get("HAVE_EXPAT", 0) : print "Expat or LibXML not found. Using bundled Expat" @@ -148,6 +150,10 @@ if not env.get("HAVE_EXPAT", 0) : env["HAVE_EXPAT"] = 1 bundledExpat = True +# Qt +if env["qt"] : + env["QTDIR"] = env["qt"] + # OpenSSL openssl_env = conf_env.Clone() use_openssl = bool(env["openssl"]) diff --git a/Swift/SConscript b/Swift/SConscript index c0b14bf..75db94d 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -1,6 +1,6 @@ Import("env") -if not env.get("HAVE_OPENSSL", 0) : +if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) : print "Error: Swift requires OpenSSL support, and OpenSSL was not found." Exit(1) |