summaryrefslogtreecommitdiff
path: root/smoketestoo_native/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'smoketestoo_native/makefile.mk')
-rw-r--r--smoketestoo_native/makefile.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index fa017304707b..d9c4dace7f96 100644
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
+#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
+
SLOFILES = $(SHL1OBJS)
SHL1TARGET = smoketest
@@ -49,7 +56,8 @@ ALLTAR : cpptest
cpptest : $(SHL1TARGETN)
-OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw
+TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
+CPPTEST_LIBRARY = $(SHL1TARGETN)
.IF "$(OS)" != "WNT"
localinstall :