diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-05 11:49:19 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-05 18:00:59 +0100 |
| commit | a6fae99466cd52143a52a98b0ac89588f679f1a1 (patch) | |
| tree | b40cee33275baa77f4cb322776fad6712dd0f547 /vcl | |
| parent | df9cbdd22658131b881e6527467c8e2a2dd36c70 (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 'vcl')
| -rw-r--r-- | vcl/CppunitTest_vcl_bitmap_test.mk | 6 | ||||
| -rw-r--r-- | vcl/CppunitTest_vcl_svm_test.mk | 7 | ||||
| -rw-r--r-- | vcl/Library_vclplug_osx.mk | 7 |
3 files changed, 3 insertions, 17 deletions
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk index 3e28b96b62e9..1c51a8d02cbe 100644 --- a/vcl/CppunitTest_vcl_bitmap_test.mk +++ b/vcl/CppunitTest_vcl_bitmap_test.mk @@ -22,13 +22,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ boost_headers \ + epoxy \ glm_headers \ )) -ifeq ($(DISABLE_GUI),) -$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\ - epoxy \ - )) -endif $(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\ $$(INCLUDE) \ diff --git a/vcl/CppunitTest_vcl_svm_test.mk b/vcl/CppunitTest_vcl_svm_test.mk index 898cf28c8475..3ed8bad38492 100644 --- a/vcl/CppunitTest_vcl_svm_test.mk +++ b/vcl/CppunitTest_vcl_svm_test.mk @@ -15,14 +15,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_svm_test, \ $(eval $(call gb_CppunitTest_use_externals,vcl_svm_test,\ boost_headers \ + epoxy \ libxml2 \ )) -ifeq ($(DISABLE_GUI),) -$(eval $(call gb_CppunitTest_use_externals,vcl_svm_test,\ - epoxy \ - )) -endif - $(eval $(call gb_CppunitTest_set_include,vcl_svm_test,\ $$(INCLUDE) \ diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk index 230aa020dda0..5e0cfd2e8d3d 100644 --- a/vcl/Library_vclplug_osx.mk +++ b/vcl/Library_vclplug_osx.mk @@ -57,18 +57,13 @@ $(eval $(call gb_Library_use_libraries,vclplug_osx,\ $(eval $(call gb_Library_use_externals,vclplug_osx,\ boost_headers \ + epoxy \ harfbuzz \ $(if $(filter SKIA,$(BUILD_TYPE)), \ skia \ ) \ )) -ifeq ($(DISABLE_GUI),) -$(eval $(call gb_Library_use_externals,vclplug_osx,\ - epoxy \ -)) -endif - $(eval $(call gb_Library_add_defs,vclplug_osx,\ -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \ -DVCL_INTERNALS \ |