summaryrefslogtreecommitdiffstats
path: root/QA
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 11:42:25 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 11:42:25 (GMT)
commitc20ecae7c569befc8c970f839ce9e14410c118fb (patch)
treeb3b5bc4afae5c86ad0173cf2b09843e90bf262f2 /QA
parent362b2d147e4050e997104c24b2ed2e818adab5ed (diff)
parent94373e3eac30fe3c1ad5565f436fa3aad212a576 (diff)
downloadswift-contrib-c20ecae7c569befc8c970f839ce9e14410c118fb.zip
swift-contrib-c20ecae7c569befc8c970f839ce9e14410c118fb.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed compilation of Slimber/Qt. Fixed flag order in Slimber. MergeFlags->UseFlags in Slimber. Use UseFlags for compiling the unit test.
Diffstat (limited to 'QA')
-rw-r--r--QA/UnitTest/SConscript30
1 files changed, 15 insertions, 15 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index a6c7dc8..3a19ea5 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -8,21 +8,21 @@ if env["TEST"] :
env["UNITTEST_OBJECTS"] = []
if env["SCONS_STAGE"] == "test" :
myenv = env.Clone()
- myenv.MergeFlags(env.get("CHECKER_FLAGS",""))
- myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
- myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
- myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
- myenv.MergeFlags(env.get("LIMBER_FLAGS",""))
- myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
- myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
- myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))
- myenv.MergeFlags(env.get("BOOST_FLAGS", ""))
- myenv.MergeFlags(env.get("SQLITE_FLAGS", ""))
- myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
- myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
- myenv.MergeFlags(env.get("ZLIB_FLAGS", ""))
- myenv.MergeFlags(env.get("OPENSSL_FLAGS", ""))
- myenv.MergeFlags(env["PLATFORM_FLAGS"])
+ myenv.UseFlags(env.get("CHECKER_FLAGS",""))
+ myenv.UseFlags(env.get("SLIMBER_FLAGS",""))
+ myenv.UseFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
+ myenv.UseFlags(env.get("SWIFTOOLS_FLAGS",""))
+ myenv.UseFlags(env.get("LIMBER_FLAGS",""))
+ myenv.UseFlags(env.get("SWIFTEN_FLAGS",""))
+ myenv.UseFlags(env.get("CPPUNIT_FLAGS",""))
+ myenv.UseFlags(env.get("LIBIDN_FLAGS", ""))
+ myenv.UseFlags(env.get("BOOST_FLAGS", ""))
+ myenv.UseFlags(env.get("SQLITE_FLAGS", ""))
+ myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
+ myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
+ myenv.UseFlags(env.get("ZLIB_FLAGS", ""))
+ myenv.UseFlags(env.get("OPENSSL_FLAGS", ""))
+ myenv.UseFlags(env["PLATFORM_FLAGS"])
if env.get("HAVE_LIBXML") :
myenv.Append(CPPDEFINES = ["HAVE_LIBXML"])
if env.get("HAVE_EXPAT") :