iOS, remove java and cppunittest

Low level functions will not be tested

Change-Id: I72fa44ea713639db97e39801a3975d6731a684c2
This commit is contained in:
jan Iversen
2017-06-27 09:10:54 +02:00
parent 344a5dbc5c
commit 99cde7238e
2 changed files with 4 additions and 4 deletions

View File

@@ -11,15 +11,13 @@ $(eval $(call gb_Module_Module,codemaker))
# if not cross-compiling or we need this for ODK # if not cross-compiling or we need this for ODK
ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE))) ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
ifneq ($(OS),IOS)
$(eval $(call gb_Module_add_targets,codemaker,\ $(eval $(call gb_Module_add_targets,codemaker,\
StaticLibrary_codemaker \ StaticLibrary_codemaker \
StaticLibrary_codemaker_cpp \ StaticLibrary_codemaker_cpp \
StaticLibrary_codemaker_java \ $(if $(filter TRUE,$(ENABLE_JAVA)),StaticLibrary_codemaker_java) \
Executable_javamaker \ $(if $(filter TRUE,$(ENABLE_JAVA)),Executable_javamaker) \
Executable_cppumaker \ Executable_cppumaker \
)) ))
endif endif
endif
# vim:set noet sw=4 ts=4: # vim:set noet sw=4 ts=4:

View File

@@ -14,8 +14,10 @@ $(eval $(call gb_Module_add_targets,salhelper,\
Library_salhelper \ Library_salhelper \
)) ))
ifneq ($(OS),IOS)
$(eval $(call gb_Module_add_check_targets,salhelper,\ $(eval $(call gb_Module_add_check_targets,salhelper,\
CppunitTest_salhelper_testapi \ CppunitTest_salhelper_testapi \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: