summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-04 08:06:56 (GMT)
committerTobias Markmann <tm@ayena.de>2015-05-04 08:06:56 (GMT)
commite53da0d1bc137df591fa4e97261a55daef8f2905 (patch)
treec9411d51a2964e75011a9f45c154c313d22bd74a
parent231a74a1e1efdc25ceec0f5d2fe93f7c3eb751b0 (diff)
downloadswift-e53da0d1bc137df591fa4e97261a55daef8f2905.zip
swift-e53da0d1bc137df591fa4e97261a55daef8f2905.tar.bz2
Ignore 3rdParty warnings on Linux platforms when using Clang or GCC
Test-Information: Tested behavior on Elementary OS 0.2.1. Change-Id: Icc0611181fbf7dbe22d6c0c8cb18be9c1cdbc138
-rw-r--r--BuildTools/SCons/Tools/qt4.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index e019b2c..be8621b 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -473,7 +473,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
include_flag = "-I"
- if self["CC"] in ("gcc", "clang"):
+ if os.path.basename(self["CC"]) in ("gcc", "clang"):
include_flag = "-isystem"
@@ -489,15 +489,15 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
if not UsePkgConfig:
if debug : debugSuffix = '_debug'
if version == '4' :
- self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include", "phonon")])
+ self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR", "include", "phonon")])
for module in modules :
module_str = module
if not version == '4' :
module_str = module_str.replace('Qt', 'Qt5')
self.AppendUnique(LIBS=[module_str+debugSuffix])
self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
- self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include")])
- self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include",module)])
+ self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR","include")])
+ self.AppendUnique(CPPFLAGS = [include_flag + os.path.join("$QTDIR","include", module)])
self["QT4_MOCCPPPATH"] = self["CPPPATH"]
return
else: