diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-11-06 17:32:56 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-11-09 20:22:11 +0100 |
| commit | 0673cd4e4e8f4b2ab9e1ac14f61958b49eebaa7a (patch) | |
| tree | 9ce44c9e2d5302de0628abe0901ed3db2aabf2fe | |
| parent | 86707e80c32c8deeef9c0992ca3ff184f42faed7 (diff) | |
vcl: CppunitTest_vcl_complextext requires DejaVu fonts
The TEST_FONTS_MISSING is already handling the --without-fonts case,
but if we build fonts we need a dependency.
(cherry picked from commit 5cf570d1d46efa66fe4724ba87f47bcd09ea4513)
configure: if there's no fontconfig, assume no fonts are available
No idea how to check what fonts are installed on Windows/Mac;
only safe thing to do is to disable the tests if --without-fonts.
(cherry picked from commit a7cd63df37144eba8544f6b10b83737fa0496461)
Change-Id: I5164fc5c5974bbce7481b0b1ef4d6013eb9c0a11
Reviewed-on: https://gerrit.libreoffice.org/44425
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vcl/CppunitTest_vcl_complextext.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 74c1a21abf89..b1fc13887658 100644 --- a/configure.ac +++ b/configure.ac @@ -11350,7 +11350,7 @@ else fi fi else - TEST_FONTS_MISSING=0 + TEST_FONTS_MISSING=1 fi fi AC_SUBST(WITH_FONTS) diff --git a/vcl/CppunitTest_vcl_complextext.mk b/vcl/CppunitTest_vcl_complextext.mk index 62a0f5b7fc9b..81dc60fe67d7 100644 --- a/vcl/CppunitTest_vcl_complextext.mk +++ b/vcl/CppunitTest_vcl_complextext.mk @@ -21,6 +21,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_complextext, \ $(eval $(call gb_CppunitTest_use_externals,vcl_complextext,boost_headers)) +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 \ |