diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-06 12:17:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-06 12:17:25 +0100 |
| commit | 5091ea5f67715faf47bdbd1f8ec62fc32ad0c8d0 (patch) | |
| tree | 2b7e62bf14ed78a590b9a6bf9e26a703454aae97 | |
| parent | 77080c41ad08d26f1d105ccdba8814f3b0b70cfe (diff) | |
#i113503# cppunit stl wrapper headers
| -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 1082e6ff9..ac99601f5 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 938b63d90..61fe7868c 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) |