This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 207d1df Unbreak --disable-unit-tests builds. The cppuhelper module
was unconditionally trying to use gtest.
207d1df is described below
commit 207d1dfce04b32b6deab2fec4f6515980b1b26f1
Author: Don Lewis <[email protected]>
AuthorDate: Fri Oct 4 15:41:43 2019 -0700
Unbreak --disable-unit-tests builds.
The cppuhelper module was unconditionally trying to use gtest.
---
main/cppuhelper/Module_cppuhelper.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/main/cppuhelper/Module_cppuhelper.mk
b/main/cppuhelper/Module_cppuhelper.mk
index b0aebdc..4d35952 100644
--- a/main/cppuhelper/Module_cppuhelper.mk
+++ b/main/cppuhelper/Module_cppuhelper.mk
@@ -24,14 +24,19 @@
$(eval $(call gb_Module_Module,cppuhelper))
$(eval $(call gb_Module_add_targets,cppuhelper,\
- GoogleTest_cppuhelper_ifcontainer \
- GoogleTest_cppuhelper_unourl \
Library_cppuhelper \
Package_inc \
Package_findsofficepath \
Package_unorc \
))
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,cppuhelper,\
+ GoogleTest_cppuhelper_ifcontainer \
+ GoogleTest_cppuhelper_unourl \
+))
+endif
+
# vim: set noet sw=4 ts=4:
