summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2022-01-05 11:49:19 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-01-05 18:00:59 +0100
commita6fae99466cd52143a52a98b0ac89588f679f1a1 (patch)
treeb40cee33275baa77f4cb322776fad6712dd0f547 /cui
parentdf9cbdd22658131b881e6527467c8e2a2dd36c70 (diff)
Disable epoxy test with --disable-gui
Instead of always testing for DISABLE_GUI, just disable the epoxy test and handle !ENABLE_EPOXY in RepositoryExternal.mk. Change-Id: I38213ffa77353bc93f32caa1b4164c5fa88170ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127999 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'cui')
-rw-r--r--cui/Library_cui.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index d0cb6cf2cc08..295b8f2eed3f 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
$(call gb_Helper_optional,OPENCL,\
clew) \
+ epoxy \
icuuc \
icu_headers \
libxml2 \
@@ -76,11 +77,6 @@ $(eval $(call gb_Library_use_externals,cui,\
orcus \
zxing \
))
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,cui,\
- epoxy \
- ))
-endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,cui,\