Swiftdiff options
Diffstat (limited to '3rdParty')
| -rw-r--r-- | 3rdParty/CppUnit/SConscript | 9 | ||||
| -rw-r--r-- | 3rdParty/hippomocks.h | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/3rdParty/CppUnit/SConscript b/3rdParty/CppUnit/SConscript index bdcea88..296f68b 100644 --- a/3rdParty/CppUnit/SConscript +++ b/3rdParty/CppUnit/SConscript @@ -2,13 +2,19 @@ Import("env") if env["TEST"] : + if env["PLATFORM"] == "win32" : + cppflags = ["/I" + Dir("src/include").abspath] + else : + cppflags = [("-isystem", Dir("src/include").abspath)] + ################################################################################ # Module flags ################################################################################ if env["SCONS_STAGE"] == "flags" : env["CPPUNIT_FLAGS"] = { - "CPPPATH": [env.Dir("src/include"), env.Dir(".")], + "CPPPATH": [env.Dir(".")], + "CPPFLAGS": cppflags, "LIBPATH": [env.Dir(".")], "LIBS": ["CppUnit"] } @@ -19,6 +25,7 @@ if env["TEST"] : if env["SCONS_STAGE"] == "build" : myenv = env.Clone() + myenv.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if not flag.startswith("-W")]) myenv.Append(CPPPATH = ["src/include", "."]) sources = [ "src/src/cppunit/TextTestRunner.cpp", diff --git a/3rdParty/hippomocks.h b/3rdParty/hippomocks.h index 5a0efe3..ae819d2 100644 --- a/3rdParty/hippomocks.h +++ b/3rdParty/hippomocks.h @@ -1,6 +1,9 @@ #ifndef HIPPOMOCKS_H
#define HIPPOMOCKS_H
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+
#ifndef EXCEPTION_BUFFER_SIZE
#define EXCEPTION_BUFFER_SIZE 65536
#endif
|