diff options
-rw-r--r-- | desktop/CppunitTest_desktop_lib.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_subsequent_export_test.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_subsequent_filters_test.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 8 | ||||
-rw-r--r-- | sw/CppunitTest_sw_layoutwriter.mk | 5 | ||||
-rw-r--r-- | sw/CppunitTest_sw_odfexport.mk | 5 | ||||
-rw-r--r-- | sw/CppunitTest_sw_ooxmlimport.mk | 2 | ||||
-rw-r--r-- | sw/CppunitTest_sw_rtfimport.mk | 2 | ||||
-rw-r--r-- | sw/CppunitTest_sw_uiwriter.mk | 5 | ||||
-rw-r--r-- | sw/CppunitTest_sw_unowriter.mk | 5 | ||||
-rw-r--r-- | sw/CppunitTest_sw_ww8export.mk | 2 | ||||
-rw-r--r-- | sw/ooxmlexport_setup.mk | 2 | ||||
-rw-r--r-- | vcl/CppunitTest_vcl_complextext.mk | 6 | ||||
-rw-r--r-- | vcl/CppunitTest_vcl_fontfeature.mk | 7 | ||||
-rw-r--r-- | vcl/CppunitTest_vcl_pdfexport.mk | 2 |
15 files changed, 32 insertions, 25 deletions
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk index 504af1d0b5c8..d0cc7f829cb8 100644 --- a/desktop/CppunitTest_desktop_lib.mk +++ b/desktop/CppunitTest_desktop_lib.mk @@ -82,4 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,desktop_lib,\ $(eval $(call gb_CppunitTest_use_configuration,desktop_lib)) +$(eval $(call gb_CppunitTest_use_more_fonts,desktop_lib)) + # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 9f826307044d..01bd5e077979 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -123,4 +123,6 @@ $(eval $(call gb_CppunitTest_use_packages,sc_subsequent_export_test, \ oox_generated \ )) +$(eval $(call gb_CppunitTest_use_more_fonts,subsequent_export_test)) + # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 7be332992978..70bd582a394a 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -130,4 +130,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test)) +$(eval $(call gb_CppunitTest_use_more_fonts,subsequent_filters_test)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 8e130d481802..33dcd09abd9f 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -373,6 +373,14 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) endef +define gb_CppunitTest_use_more_fonts +ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) +$(call gb_CppunitTest_get_target,$(1)) : \ + $(foreach font,$(gb_Package_MODULE_ooo_fonts),$(call gb_Package_get_target,$(font))) +endif + +endef + define gb_CppunitTest_use_java_ure $(call gb_CppunitTest_get_target,$(1)) : JAVA_URE := $(true) $(call gb_CppunitTest_get_target,$(1)) : \ diff --git a/sw/CppunitTest_sw_layoutwriter.mk b/sw/CppunitTest_sw_layoutwriter.mk index e5f5a180920e..b10f624259f4 100644 --- a/sw/CppunitTest_sw_layoutwriter.mk +++ b/sw/CppunitTest_sw_layoutwriter.mk @@ -68,9 +68,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_layoutwriter, \ $(call gb_CppunitTest_get_target,sw_layoutwriter): \ $(call gb_Library_get_target,textconv_dict) -ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(call gb_CppunitTest_get_target,sw_layoutwriter): \ - $(call gb_ExternalPackage_get_target,fonts_liberation) -endif +$(eval $(call gb_CppunitTest_use_more_fonts,sw_layoutwriter)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index b3771e3af57d..8a65c583a5ad 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -64,9 +64,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_odfexport, \ svx \ )) -ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(call gb_CppunitTest_get_target,sw_odfexport): \ - $(call gb_ExternalPackage_get_target,fonts_liberation) -endif +$(eval $(call gb_CppunitTest_use_more_fonts,sw_odfexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index e969118f99d5..de38d0877be4 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -108,4 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport)) +$(eval $(call gb_CppunitTest_use_more_fonts,sw_ooxmlimport)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index fc68b95d1141..92cc12c75a28 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -95,4 +95,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_rtfimport,\ modules/swriter \ )) +$(eval $(call gb_CppunitTest_use_more_fonts,sw_rtfimport)) + # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index d11d1754892b..3ca0a664d52e 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -72,9 +72,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_uiwriter, \ $(call gb_CppunitTest_get_target,sw_uiwriter): \ $(call gb_Library_get_target,textconv_dict) -ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(call gb_CppunitTest_get_target,sw_uiwriter): \ - $(call gb_ExternalPackage_get_target,fonts_liberation) -endif +$(eval $(call gb_CppunitTest_use_more_fonts,sw_uiwriter)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_unowriter.mk b/sw/CppunitTest_sw_unowriter.mk index a51f4ac38000..b4b27bd402a4 100644 --- a/sw/CppunitTest_sw_unowriter.mk +++ b/sw/CppunitTest_sw_unowriter.mk @@ -68,9 +68,6 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_unowriter, \ $(call gb_CppunitTest_get_target,sw_unowriter): \ $(call gb_Library_get_target,textconv_dict) -ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(call gb_CppunitTest_get_target,sw_unowriter): \ - $(call gb_ExternalPackage_get_target,fonts_liberation) -endif +$(eval $(call gb_CppunitTest_use_more_fonts,sw_unowriter)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 41210a8b88b3..4fcf5be03470 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -88,4 +88,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export)) +$(eval $(call gb_CppunitTest_use_more_fonts,sw_ww8export)) + # vim: set noet sw=4 ts=4: diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index cf3a15bc61e0..11fa454fae93 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -133,6 +133,8 @@ $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlexport$(1),\ $(call gb_CppunitTest_get_target,sw_ooxmlexport$(1)) : $(call gb_Library_get_target,iti) +$(eval $(call gb_CppunitTest_use_more_fonts,sw_ooxmlexport$(1))) + endef # vim: set noet sw=4 ts=4: diff --git a/vcl/CppunitTest_vcl_complextext.mk b/vcl/CppunitTest_vcl_complextext.mk index ec4c071c5a9b..56b9bcd3f72f 100644 --- a/vcl/CppunitTest_vcl_complextext.mk +++ b/vcl/CppunitTest_vcl_complextext.mk @@ -24,10 +24,6 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_complextext,\ harfbuzz \ )) -ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(eval $(call gb_CppunitTest_use_package,vcl_complextext,fonts_dejavu)) -endif - $(eval $(call gb_CppunitTest_use_libraries,vcl_complextext, \ comphelper \ cppu \ @@ -53,4 +49,6 @@ $(eval $(call gb_CppunitTest_use_components,vcl_complextext,\ $(eval $(call gb_CppunitTest_use_configuration,vcl_complextext)) +$(eval $(call gb_CppunitTest_use_more_fonts,vcl_complextext)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/CppunitTest_vcl_fontfeature.mk b/vcl/CppunitTest_vcl_fontfeature.mk index d54126a42d33..07a1b319e2da 100644 --- a/vcl/CppunitTest_vcl_fontfeature.mk +++ b/vcl/CppunitTest_vcl_fontfeature.mk @@ -20,11 +20,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_fontfeature, \ $(eval $(call gb_CppunitTest_use_externals,vcl_fontfeature,boost_headers)) -ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) -$(call gb_CppunitTest_get_target,vcl_fontfeature): \ - $(call gb_ExternalPackage_get_target,fonts_libertineg) -endif - $(eval $(call gb_CppunitTest_use_libraries,vcl_fontfeature, \ comphelper \ cppu \ @@ -51,4 +46,6 @@ $(eval $(call gb_CppunitTest_use_components,vcl_fontfeature,\ $(eval $(call gb_CppunitTest_use_configuration,vcl_fontfeature)) +$(eval $(call gb_CppunitTest_use_more_fonts,vcl_fontfeature)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/CppunitTest_vcl_pdfexport.mk b/vcl/CppunitTest_vcl_pdfexport.mk index 7f87335fc049..45123e7c2811 100644 --- a/vcl/CppunitTest_vcl_pdfexport.mk +++ b/vcl/CppunitTest_vcl_pdfexport.mk @@ -42,4 +42,6 @@ $(eval $(call gb_CppunitTest_use_rdb,vcl_pdfexport,services)) $(eval $(call gb_CppunitTest_use_configuration,vcl_pdfexport)) +$(eval $(call gb_CppunitTest_use_more_fonts,vcl_pdfexport)) + # vim: set noet sw=4 ts=4: |