diff options
-rw-r--r-- | tools/qa/makefile.mk | 7 | ||||
-rw-r--r-- | tools/qa/test_pathutils.cxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk index 67d8f621fabd..7e8720efef71 100644 --- a/tools/qa/makefile.mk +++ b/tools/qa/makefile.mk @@ -32,6 +32,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) DLLPRE = # no leading "lib" on .so files diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx index 99046a6211c9..fcd838767425 100644 --- a/tools/qa/test_pathutils.cxx +++ b/tools/qa/test_pathutils.cxx @@ -31,9 +31,11 @@ #include <cwchar> +#include "preextstl.h" #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> +#include "postextstl.h" #include "tools/pathutils.hxx" |