summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-04 09:54:58 (GMT)
committerTobias Markmann <tm@ayena.de>2015-05-04 09:54:58 (GMT)
commit8e08eb7cb5638a32d4d7e2b73ef2aa1e933965bb (patch)
tree82276f7226aa9d0238452437531a22b09f4fafdd /3rdParty
parent430f8e3d2f7afac17f51d37bf502586dc2dc32cc (diff)
downloadswift-8e08eb7cb5638a32d4d7e2b73ef2aa1e933965bb.zip
swift-8e08eb7cb5638a32d4d7e2b73ef2aa1e933965bb.tar.bz2
Hide 3rdParty warnings for LibIDN and LibMiniUPnPc with Clang/GCC
Test-Information: Tested behavior on Elementary OS 0.2.1. Change-Id: I5f4c77202e000f691682caf06df7c1f7976299c4
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/LibIDN/SConscript8
-rw-r--r--3rdParty/LibMiniUPnPc/SConscript8
2 files changed, 14 insertions, 2 deletions
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
index 92d6836..3711ad8 100644
--- a/3rdParty/LibIDN/SConscript
+++ b/3rdParty/LibIDN/SConscript
@@ -1,5 +1,7 @@
Import(["env", "conf_env"])
+import os
+
if env.get("LIBIDN_BUNDLED", False) :
################################################################################
@@ -9,8 +11,12 @@ if env.get("LIBIDN_BUNDLED", False) :
if env["SCONS_STAGE"] == "flags" :
env["LIBIDN_FLAGS"] = {
"CPPDEFINES": ["IDNA_STATIC"],
- "CPPPATH": [Dir("src")],
}
+ if os.path.basename(env["CC"]) in ("clang", "gcc") :
+ env["LIBIDN_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibIDN/src"]})
+ else :
+ env["LIBIDN_FLAGS"].update({"CPPPATH": [Dir("src")]})
+
if env["PLATFORM"] == "win32" :
env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
if env["MSVC_VERSION"][:3] == "9.0" :
diff --git a/3rdParty/LibMiniUPnPc/SConscript b/3rdParty/LibMiniUPnPc/SConscript
index 0ed6da4..ce2fe48 100644
--- a/3rdParty/LibMiniUPnPc/SConscript
+++ b/3rdParty/LibMiniUPnPc/SConscript
@@ -1,5 +1,7 @@
Import(["env", "conf_env"])
+import os
+
if env.get("LIBMINIUPNPC_BUNDLED", False) :
################################################################################
@@ -9,10 +11,14 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
if env["SCONS_STAGE"] == "flags" :
env["HAVE_LIBMINIUPNPC"] = True
env["LIBMINIUPNPC_FLAGS"] = {
- "CPPPATH": [Dir("src/miniupnpc")],
"LIBPATH": [Dir(".")],
"INTERNAL_CPPDEFINES": ["STATICLIB"],
}
+ if os.path.basename(env["CC"]) in ("clang", "gcc") :
+ env["LIBMINIUPNPC_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibMiniUPnPc/src/miniupnpc"]})
+ else :
+ env["LIBMINIUPNPC_FLAGS"].update({"CPPPATH": [Dir("src/miniupnpc")]})
+
#if env["PLATFORM"] == "win32" :
# env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
# if env["MSVC_VERSION"][:3] == "9.0" :