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 | 565fe5c7861c113282ad870508e3696bc4c5ddff (patch) | |
| tree | 2de3a135065f1dd1fc070d4cac363d92113d8b00 | |
| parent | 9e5fb5e38c2dce31725b64c359e4c5c9f8657d3b (diff) | |
| parent | 5091ea5f67715faf47bdbd1f8ec62fc32ad0c8d0 (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 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) |