Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-07-17 18:50:44 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-07-17 18:50:44 (GMT) |
| commit | 4a251b6acf7d70cd63dbd9983a8585368027520a (patch) | |
| tree | c03659fcfb07cf8508272650718ef691e4db4921 | |
| parent | 93f21561e220733f1b0f32cdd4bf30ecdb70eb0e (diff) | |
| download | swift-contrib-4a251b6acf7d70cd63dbd9983a8585368027520a.zip swift-contrib-4a251b6acf7d70cd63dbd9983a8585368027520a.tar.bz2 | |
Make sure flags are consistent across different modules.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | QA/Checker/SConscript | 1 | ||||
| -rw-r--r-- | SwifTools/SConscript | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -31,7 +31,7 @@ moc_* qrc_* ui_* config.py -checker +/QA/Checker/checker config.log .sconf_temp .sconsign.dblite diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript index 63bd924..1d0d255 100644 --- a/QA/Checker/SConscript +++ b/QA/Checker/SConscript @@ -11,6 +11,7 @@ if env["TEST"] : if env["SCONS_STAGE"] == "build" : checker_env = env.Clone() + checker_env.MergeFlags(env["SWIFTEN_FLAGS"]) checker_env.MergeFlags(env["BOOST_FLAGS"]) checker_env.MergeFlags(env["CPPUNIT_FLAGS"]) checker_env.Library("Checker", ["checker.cpp", "IO.cpp"]) diff --git a/SwifTools/SConscript b/SwifTools/SConscript index e5085cc..5b97bed 100644 --- a/SwifTools/SConscript +++ b/SwifTools/SConscript @@ -16,6 +16,7 @@ if env["SCONS_STAGE"] == "flags" : if env["SCONS_STAGE"] == "build" : swiftools_env = env.Clone() + swiftools_env.MergeFlags(swiftools_env["SWIFTEN_FLAGS"]) swiftools_env.MergeFlags(swiftools_env["BOOST_FLAGS"]) sources = [ |