summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-02 20:04:42 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-02 20:06:29 (GMT)
commitca39e52da0bf9027ab660fd31d1285b1c1d55659 (patch)
treeebbcf7dc2a2c063b9070a779f629ddefd21043bc /BuildTools
parent60a1dfe187dbe11e61e7f867e4c04454a9d3a5e6 (diff)
downloadswift-contrib-ca39e52da0bf9027ab660fd31d1285b1c1d55659.zip
swift-contrib-ca39e52da0bf9027ab660fd31d1285b1c1d55659.tar.bz2
Add workaround for distros that don't have boost UUID.
Cherry pick UUID out of 3rdParty, and use this as an include path. Since UUID is a header-only lib, this shouldn't pose problems.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct3
1 files changed, 3 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 9e79c4c..67d60de 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -281,6 +281,9 @@ for (lib, header) in boostLibs :
break
if allLibsPresent :
env["BOOST_FLAGS"] = { "LIBS": ["boost_" + lib for lib, header in boostLibs] }
+ if not conf.CheckCXXHeader("boost/uuid/uuid.hpp") :
+ # FIXME: Remove this workaround when UUID is available in most distros
+ env["BOOST_BUNDLED_UUID_ONLY"] = True
else :
env["BOOST_BUNDLED"] = True