summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/CppUnit')
-rw-r--r--3rdParty/CppUnit/SConscript9
1 files changed, 8 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",