diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-20 23:24:13 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-21 14:19:47 +0200 |
| commit | efa6a5f0444ab2299f91608f4a5b78848814458e (patch) | |
| tree | 86735c6b848d2a37a0b1ea347a0e7b801e85403d | |
| parent | 747257231e652b75a3fb2ec63d4df114f0aff37a (diff) | |
Filter out stuff not built for iOS
| -rw-r--r-- | sc/CppunitTest_sc_cellrangeobj.mk | 3 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 3 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_datapilottableobj.mk | 6 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 6 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 3 |
5 files changed, 14 insertions, 7 deletions
diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index a6a43d5588d4..530aa9afaf8b 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -91,7 +91,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\ )) $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\ - basic/util/sb \ + $(if $(filter-out $(OS),IOS), \ + basic/util/sb) \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index b1e54b02427c..9b21db085c13 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -90,7 +90,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\ )) $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\ - basic/util/sb \ + $(if $(filter-out $(OS),IOS), \ + basic/util/sb) \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 5e14b91a76d4..9e06aecf323b 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -90,10 +90,12 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilottableobj,\ )) $(eval $(call gb_CppunitTest_add_components,sc_datapilottableobj,\ - basic/util/sb \ + $(if $(filter-out $(OS),IOS), \ + basic/util/sb) \ comphelper/util/comphelp \ configmgr/source/configmgr \ - dbaccess/util/dba \ + $(if $(filter-out $(OS),IOS), \ + dbaccess/util/dba) \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ forms/util/frm \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 32f7d47d8aaa..8a4a3ccc2840 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -87,13 +87,15 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\ )) $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ - basic/util/sb \ + $(if $(filter-out $(OS),IOS), \ + basic/util/sb) \ chart2/source/controller/chartcontroller \ chart2/source/tools/charttools \ chart2/source/model/chartmodel \ comphelper/util/comphelp \ configmgr/source/configmgr \ - dbaccess/util/dba \ + $(if $(filter-out $(OS),IOS), \ + dbaccess/util/dba) \ eventattacher/source/evtatt \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index a221f22d986f..b0b3441466ba 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,7 +54,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ JunitTest_sc_complex \ JunitTest_sc_unoapi \ CppunitTest_sc_cellrangeobj \ - CppunitTest_sc_databaserangeobj \ + $(if $(filter-out $(OS),IOS), \ + CppunitTest_sc_databaserangeobj) \ CppunitTest_sc_datapilottableobj \ CppunitTest_sc_datapilotfieldobj \ CppunitTest_sc_macros_test \ |