[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/Module_vcl.mk

2020-07-21 Thread Tor Lillqvist (via logerrit)
 vcl/Module_vcl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0ea5472de50589706ae5b46ea7bb78ef71cafc7
Author: Tor Lillqvist 
AuthorDate: Tue Jul 21 10:43:40 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jul 21 10:43:40 2020 +0300

Fix typo

Change-Id: Icf532e47badd96a84f2f774a14af0274e336bfc5

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index ff1499aac2f9..a98662fb2881 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -204,7 +204,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_png_test \
CppunitTest_vcl_widget_definition_reader_test \
CppunitTest_vcl_backend_test \
-   $(call gb_Helper_optional, PDFIUM \
+   $(call gb_Helper_optional, PDFIUM, \
CppunitTest_vcl_pdfium_library_test) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/Module_vcl.mk

2020-07-21 Thread Tor Lillqvist (via logerrit)
 vcl/Module_vcl.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0e15c666b76339ad291205d50b2dfe66c00e0d90
Author: Tor Lillqvist 
AuthorDate: Tue Jul 21 10:11:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jul 21 09:39:02 2020 +0200

Bypass CppunitTest_vcl_pdfium_library_test unless we have PDFIUM

Change-Id: Ic93b2bf66ded948009a9d2d045d98a4bde9ee249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99119
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 8f4fa5adf6d6..ff1499aac2f9 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -204,7 +204,8 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_png_test \
CppunitTest_vcl_widget_definition_reader_test \
CppunitTest_vcl_backend_test \
-   CppunitTest_vcl_pdfium_library_test \
+   $(call gb_Helper_optional, PDFIUM \
+   CppunitTest_vcl_pdfium_library_test) \
 ))
 
 ifeq ($(USING_X11),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits