summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-01-28 18:34:03 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-01-28 18:34:03 (GMT)
commit14efae9ac27757b226a047ac2fbded2c5c85be3c (patch)
treee3fe08fee3b52ad497655f450f9d20cd69f0bb05
parent3a2277f5116cbf1ca3bc87ccb45eec5a9f2c80b4 (diff)
downloadswift-contrib-14efae9ac27757b226a047ac2fbded2c5c85be3c.zip
swift-contrib-14efae9ac27757b226a047ac2fbded2c5c85be3c.tar.bz2
Treat 3rdPatry boost/uuid dir as system dir.
This fixes compilation warnings in uuid.
-rw-r--r--3rdParty/Boost/SConscript6
1 files changed, 5 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 87d8ef5..86871fd 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -5,7 +5,11 @@ if env.get("BOOST_BUNDLED_UUID_ONLY", False) :
# Cherry pick UUID out of the 3rdParty dir, install it in a separate
# dir, and use this as an include path.
if env["SCONS_STAGE"] == "flags" :
- env["BOOST_FLAGS"]["CPPFLAGS"] = env["BOOST_FLAGS"].get("CPPFLAGS", []) + ["-I" + env.Dir("uuid").abspath]
+ if env["PLATFORM"] == "win32" :
+ uuid_cppflags = ["/I" + Dir("uuid").abspath]
+ else :
+ uuid_cppflags = [("-isystem", Dir("uuid").abspath)]
+ env["BOOST_FLAGS"]["CPPFLAGS"] = env["BOOST_FLAGS"].get("CPPFLAGS", []) + uuid_cppflags
elif env["SCONS_STAGE"] == "build" :
env.Install("uuid/boost", "src/boost/uuid")