Kaydet (Commit) ce5c72c9 authored tarafından Andre Fischer's avatar Andre Fischer

Do not add targets for junit tests when junit is disabled.

üst 95b3ad65
......@@ -28,8 +28,10 @@ $(eval $(call gb_Module_add_targets,comphelper,\
Library_comphelp \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\
JunitTest_comphelper_complex \
))
endif
# vim: set noet ts=4 sw=4:
......@@ -36,8 +36,11 @@ $(eval $(call gb_Module_add_targets,framework,\
Package_unotypes \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
JunitTest_framework_complex \
JunitTest_framework_unoapi \
))
endif
# vim: set noet ts=4 sw=4:
......@@ -36,10 +36,12 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\
))
endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
JunitTest_sfx2_complex \
JunitTest_sfx2_unoapi \
))
endif
ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
$(eval $(call gb_Module_add_targets,sfx2,\
......
......@@ -28,7 +28,9 @@ $(eval $(call gb_Module_add_targets,sot,\
Library_sot \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,sot,\
JunitTest_sot_complex \
))
endif
......@@ -31,9 +31,11 @@ $(eval $(call gb_Module_add_targets,svl,\
Package_inc \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svl,\
JunitTest_svl_complex \
))
endif
#todo: dde platform dependent
#todo: package_inc
......
......@@ -33,9 +33,11 @@ $(eval $(call gb_Module_add_targets,svtools,\
Package_inc \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
JunitTest_svtools_unoapi \
))
endif
#todo: javapatchres
#todo: jpeg on mac in svtools/util/makefile.mk
......
......@@ -36,9 +36,11 @@ $(eval $(call gb_Module_add_targets,svx,\
Package_sdi \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
JunitTest_svx_unoapi \
))
endif
#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
......
......@@ -36,9 +36,11 @@ $(eval $(call gb_Module_add_targets,sw,\
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
JunitTest_sw_complex \
JunitTest_sw_unoapi \
))
endif
# vim: set noet ts=4 sw=4:
......@@ -31,9 +31,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
Package_util \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
JunitTest_toolkit_complex \
JunitTest_toolkit_unoapi \
))
endif
# vim: set noet sw=4 ts=4:
......@@ -28,9 +28,11 @@ $(eval $(call gb_Module_add_targets,unoxml,\
Library_unordf \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
JunitTest_unoxml_complex \
JunitTest_unordf_complex \
))
endif
# vim: set noet sw=4 ts=4:
......@@ -30,9 +30,11 @@ $(eval $(call gb_Module_add_targets,xmloff,\
Package_inc \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
JunitTest_xmloff_unoapi \
))
endif
#todo: map file
#todo: xmlkywd.lib - built, but never used?!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment