[Libreoffice-commits] core.git: chart2/Module_chart2.mk dbaccess/Module_dbaccess.mk sc/Module_sc.mk sw/Module_sw.mk

jan Iversen jani at libreoffice.org
Fri Jun 23 19:40:35 UTC 2017


 chart2/Module_chart2.mk     |    2 ++
 dbaccess/Module_dbaccess.mk |    2 ++
 sc/Module_sc.mk             |    2 ++
 sw/Module_sw.mk             |    2 ++
 4 files changed, 8 insertions(+)

New commits:
commit 5a72018557d649ede54b739a07a124b86848261d
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Jun 23 21:38:25 2017 +0200

    iOS, convert CPPUnittest to noop
    
    unittest is not supported for iOS
    due to the way it is build
    
    Change-Id: I0682c5252231668edc2ec186147b872ef6fcc695

diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 3273055d5373..5e2d820bd7b9 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_add_l10n_targets,chart2,\
 	UIConfig_chart2 \
 ))
 
+ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_check_targets,chart2,\
 	CppunitTest_chart2_common_functors \
 ))
@@ -53,5 +54,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\
 $(eval $(call gb_Module_add_screenshot_targets,chart2,\
     CppunitTest_chart2_dialogs_test \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 218fa6664fb9..f7bd82efd669 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
 	UIConfig_dbtdata \
 ))
 
+ifneq ($(OS),IOS)
 ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
     CppunitTest_dbaccess_firebird_test \
@@ -84,5 +85,6 @@ $(eval $(call gb_Module_add_screenshot_targets,dbaccess,\
 ))
 
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index e19747e05b3b..d1248eaca7d7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,sc,\
 
 endif
 
+ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_check_targets,sc,\
 	Library_scqahelper \
 	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
@@ -146,5 +147,6 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
 	UITest_autofilter \
 	UITest_search_replace \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 0ab442fb3c7b..243566b9de9e 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_targets,sw,\
 	$(call gb_Helper_optional,DESKTOP,Library_swui) \
 ))
 
+ifneq ($(OS),IOS)
 $(eval $(call gb_Module_add_l10n_targets,sw,\
     AllLangResTarget_sw \
 	UIConfig_sglobal \
@@ -115,5 +116,6 @@ $(eval $(call gb_Module_add_screenshot_targets,sw,\
     CppunitTest_sw_dialogs_test \
     CppunitTest_sw_dialogs_test_2 \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list