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 | 6b16723121bffd8ebf9b8e688af5457235f687ef (patch) | |
| tree | 188606953a23111650389d3bbbe635bfc9686ef7 /basegfx | |
| parent | af820cae74c9fc08d7da6c304aec432c23cc8811 (diff) | |
cmcfixes77: #i113503# system non-stlport cppunit with OOo stlport
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/test/basegfx1d.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/basegfx2d.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/basegfx3d.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/basegfxtools.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/boxclipper.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/clipstate.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/genericclipper.cxx | 2 | ||||
| -rw-r--r-- | basegfx/test/makefile.mk | 7 |
8 files changed, 21 insertions, 0 deletions
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 41ac65da56e3..9b189bd8b236 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -30,10 +30,12 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" +#include "postextstl.h" namespace basegfx1d { diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 31005a158982..53501d190c03 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -30,9 +30,11 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index a16132e0810f..4871dcbd16c4 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -30,9 +30,11 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" namespace basegfx3d { diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx index 1a8b97a559b2..7e385f1eb78c 100644 --- a/basegfx/test/basegfxtools.cxx +++ b/basegfx/test/basegfxtools.cxx @@ -30,9 +30,11 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <basegfx/tools/keystoplerp.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index d52218a51ee0..b1e08087136f 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -30,9 +30,11 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index 3d9f59979aa7..48c1e5967260 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -30,9 +30,11 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <basegfx/tools/b2dclipstate.hxx> #include <basegfx/range/b2dpolyrange.hxx> diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index 84230a084493..d6c97c0567dc 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -30,9 +30,11 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index 2c0f30c291a9..09d8b805f9f5 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -36,6 +36,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) # --- Common ---------------------------------------------------------- |