diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-08-01 18:18:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-08-01 18:18:33 +0300 |
| commit | 7ff697bc1352d55bb26ca59b6345b7da5ad16152 (patch) | |
| tree | ce0e33e365d70f3ea7d5b59277adaf3361e544fa /cppuhelper/qa/propertysetmixin | |
| parent | Build static binaryurp unit tester for iOS (diff) | |
| download | core-7ff697bc1352d55bb26ca59b6345b7da5ad16152.tar.gz core-7ff697bc1352d55bb26ca59b6345b7da5ad16152.zip | |
Add statically linked cpphelper unit test for iOS
Diffstat (limited to 'cppuhelper/qa/propertysetmixin')
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/makefile.mk | 9 | ||||
| -rw-r--r-- | cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index 384e2b047883..6f43fc740fb7 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -25,7 +25,7 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" && "$(OS)" != "IOS" nothing .PHONY: .ELSE @@ -41,11 +41,6 @@ my_components = $(TARGET).cpp $(TARGET).java .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .IF "$(OS)" == "WNT" my_file = file:/// .ELSE @@ -99,7 +94,9 @@ $(MISC)/$(TARGET)/javamaker.flag: $(MISC)/$(TARGET)/types.rdb $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -Gc -X$(SOLARBINDIR)/udkapi.rdb $< $(TOUCH) $@ +.IF "$(SOLAR_JAVA)"!="" $(JAVATARGET): $(MISC)/$(TARGET)/javamaker.flag +.ENDIF $(MISC)/$(TARGET)/services.rdb .ERRREMOVE: $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/$(TARGET)/services.input \ diff --git a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx index 49b8cd07a6fd..cad8c663539c 100644 --- a/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx +++ b/cppuhelper/qa/propertysetmixin/test_propertysetmixin.cxx @@ -29,6 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppuhelper.hxx" +#ifdef IOS +#define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTest_cppuhelper_propertysetmixin +#endif + #include "sal/config.h" #include "test/cppuhelper/propertysetmixin/CppSupplier.hpp" |