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/SConstruct
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/SConstruct')
-rw-r--r--BuildTools/SCons/SConstruct4
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 6dd1115..b5757b8 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -211,7 +211,7 @@ if env.get("boost_includedir", None) :
boost_flags["CPPFLAGS"] = [("-isystem", env["boost_includedir"])]
boost_conf_env.MergeFlags(boost_flags)
conf = Configure(boost_conf_env)
-boostLibs = [("signals", None), ("system", "system/system_error.hpp"), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("serialization", "archive/text_oarchive.hpp"), ("date_time", "date_time/date.hpp")]
+boostLibs = [(None, "signals2.hpp"), ("system", "system/system_error.hpp"), ("thread", None), ("regex", None), ("program_options", None), ("filesystem", None), ("serialization", "archive/text_oarchive.hpp"), ("date_time", "date_time/date.hpp")]
allLibsPresent = True
libNames = []
for (lib, header) in boostLibs :
@@ -222,7 +222,7 @@ for (lib, header) in boostLibs :
if not conf.CheckCXXHeader(header) :
allLibsPresent = False
break
- if env["PLATFORM"] != "win32" :
+ if lib and env["PLATFORM"] != "win32" :
libName = "boost_" + lib
if not conf.CheckLib(libName, language='CXX') :
libName += "-mt"