summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-01 18:21:16 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-01 18:24:46 (GMT)
commit52d670e643a8c6b22f312e376898b9b8bec75984 (patch)
tree38909ecf12698b738adf78e40feb831b52b84e8c
parentcf798b8213dc0800b312b73e715bf234510a2797 (diff)
downloadswift-contrib-52d670e643a8c6b22f312e376898b9b8bec75984.zip
swift-contrib-52d670e643a8c6b22f312e376898b9b8bec75984.tar.bz2
Adding note on why we can't use system Boost.
-rw-r--r--BuildTools/SCons/SConstruct15
1 files changed, 15 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 9b6be78..6e98e87 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -268,6 +268,21 @@ if conf.CheckCHeader("idna.h") and conf.CheckLib("idn") :
else :
env["LIBIDN_BUNDLED"] = 1
+# Boost
+# NOTE: We can't use the system boost, because of 'signals' (which we
+# redefine as signals2 for avoiding Qt clashes)
+#boostLibs = ["boost_signals", "boost_thread", "boost_program_options", "boost_filesystem"]
+#if conf.CheckCHeader("boost/foreach.hpp") and conf.CheckCHeader("boost/signals.hpp") and conf.CheckCHeader("boost/thread.hpp") and conf.CheckCHeader("boost/program_options.hpp") and Conf.CheckCHeader("boost/filesystem.hpp") :
+# allLibsPresent = True
+# for lib in boostLibs :
+# if not env.CheckLib(lib) :
+# allLibsPresent = False
+# break
+# if allLibsPresent :
+# env["BOOST_FLAGS"] = { "LIBS": [boostLibs] }
+# else :
+# env["BOOST_BUNDLED"] = True
+
# Avahi
if env["PLATFORM"] != "darwin" :
if conf.CheckCHeader("avahi-client/client.h") and conf.CheckLib("avahi-client") :