diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 16:05:00 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 16:05:00 +0200 |
| commit | b05470dba7966b0120417fcb453614f125c97601 (patch) | |
| tree | 83c186ba3c62242c5221763d6d179cff238ee127 | |
| parent | 43c8309505b4b02b61f84d66fc7a998e4e82396b (diff) | |
| parent | b7133fc066f5c956e499b1bd38716bcaa4643e57 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/ure
| -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) |