summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-07-21 09:15:10 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-07-22 16:31:37 (GMT)
commit1b5b4c8c57b34b1a451418472442197b8ae1da37 (patch)
tree509e9f8187330fdf6d43dd397be66c109c50089c /BuildTools/SCons/Tools
parentf0e513b179d1b04c0e16537886b0dc5215537279 (diff)
downloadswift-1b5b4c8c57b34b1a451418472442197b8ae1da37.zip
swift-1b5b4c8c57b34b1a451418472442197b8ae1da37.tar.bz2
Ignore warnings in Qt headers and fix Boost.Signals2 detection
SCons will now include Qt headers via -isystem if the compiler is either clang or gcc to ignore warnings in files out of our control. Fix SCons to test for boost/signals2.hpp header instead of boost/signals.hpp as we migrated to the newer signals2 library. Test-Information: Successfully build with allow_warnings=0 on Debian 8.5 with system boost. Change-Id: Ie6871daae73d97369de4de652e994ad5542715cf
Diffstat (limited to 'BuildTools/SCons/Tools')
-rw-r--r--BuildTools/SCons/Tools/qt4.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py
index 31477c6..0e248d9 100644
--- a/BuildTools/SCons/Tools/qt4.py
+++ b/BuildTools/SCons/Tools/qt4.py
@@ -516,8 +516,11 @@ def enable_modules(self, modules, debug=False, crosscompiling=False, version='4'
test_conf.Finish()
raise Exception('Qt installation is missing packages. The following are required: %s' % modules_str)
return
- test_conf.env.ParseConfig("pkg-config --cflags --libs " + modules_str)
- self.AppendUnique(LIBS=test_conf.env["LIBS"], LIBPATH=test_conf.env["LIBPATH"], CPPPATH=test_conf.env["CPPPATH"])
+
+ def parse_conf_as_system(env, cmd, unique=1):
+ return env.MergeFlags(cmd.replace("-I/", include_flag + "/"), unique)
+
+ test_conf.env.ParseConfig("pkg-config --cflags --libs " + modules_str, parse_conf_as_system)
self["QT4_MOCCPPPATH"] = self["CPPPATH"]
test_conf.Finish()
return