Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-06-10 12:38:40 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-06-10 13:11:04 (GMT) |
| commit | f038599ba697acc17a328ef4ade5514fede8887e (patch) | |
| tree | 1a7cb59f2490bbfd60fff2c92e147d93ea6d1166 /QA/Checker/SConscript | |
| parent | 33ffcd9bf5bc9806d0b404aae2aaf6d67a2945db (diff) | |
| download | swift-f038599ba697acc17a328ef4ade5514fede8887e.zip swift-f038599ba697acc17a328ef4ade5514fede8887e.tar.bz2 | |
Fix remaining compiler warnings on OS X with clang
This changes HippoMocks include to -isystem include so it will
not cause compiler warnings.
This changes UserLocation floating point values to double and
remove remaining numerical casts.
Change C++11 compiler test to not cause warnings.
Test-Information:
Builds with allow_warnings=0 on OS X 10.11.5 with Xcode clang.
Change-Id: I26c60265a86c9be656089ade63fe9ad63851580f
Diffstat (limited to 'QA/Checker/SConscript')
| -rw-r--r-- | QA/Checker/SConscript | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/QA/Checker/SConscript b/QA/Checker/SConscript index 06ec01b..f8a3ce4 100644 --- a/QA/Checker/SConscript +++ b/QA/Checker/SConscript @@ -1,14 +1,20 @@ +import os + Import("env") if env["TEST"] : if env["SCONS_STAGE"] == "flags" : env["CHECKER_FLAGS"] = { - "CPPPATH" : ["#/3rdParty/HippoMocks"], "LIBS": ["Checker"], "LIBPATH": [Dir(".")], "LINKFLAGS": env["PLATFORM"] == "win32" and ["/SUBSYSTEM:CONSOLE"] or [] } + if os.path.basename(env["CC"]) in ("clang", "gcc"): + env["CHECKER_FLAGS"]["CPPFLAGS"] = ["-isystem" + Dir("#/3rdParty/HippoMocks").abspath] + else : + env["CHECKER_FLAGS"]["CPPPATH"] = ["#/3rdParty/HippoMocks"] + if env["SCONS_STAGE"] == "build" : checker_env = env.Clone() checker_env.UseFlags(env["SWIFTEN_FLAGS"]) |