diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-08-03 10:01:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-08-03 10:01:07 +0100 |
| commit | fc04c69770bfaadf38870cacfcd46125c13f367d (patch) | |
| tree | f5dcdb595e46e9e87061172c0eb48a8387d7126e /sal/cppunittester | |
| parent | e92af537345358c7df58f89cf9da497277555592 (diff) | |
cmcfixes77: #i113503# system non-stlport cppunit with OOo stlport
Diffstat (limited to 'sal/cppunittester')
| -rw-r--r-- | sal/cppunittester/cppunittester.cxx | 2 | ||||
| -rw-r--r-- | sal/cppunittester/makefile.mk | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 1082e6ff9844..ac99601f5ce5 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -31,6 +31,7 @@ #include <cstdlib> #include <iostream> +#include "preextstl.h" #include "cppunit/CompilerOutputter.h" #include "cppunit/TestResult.h" #include "cppunit/TestResultCollector.h" @@ -38,6 +39,7 @@ #include "cppunit/extensions/TestFactoryRegistry.h" #include "cppunit/plugin/PlugInManager.h" #include "cppunit/portability/Stream.h" +#include "postextstl.h" #include "osl/thread.h" #include "rtl/process.h" #include "rtl/string.hxx" diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk index 938b63d90ae9..61fe7868c9f3 100644 --- a/sal/cppunittester/makefile.mk +++ b/sal/cppunittester/makefile.mk @@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) OBJFILES = $(APP1OBJS) |