[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/CppunitTest.mk |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 8c668b8a398d686e30fe999dc4b06aa7004725fb
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 19 11:52:49 2011 +0100

    use system cppunit if configured so

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cb7cbba..b26d545 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -55,7 +55,19 @@ endef
 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
+ifeq ($(SYSTEM_CPPUNIT),"YES")
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
+else
+$(call gb_LinkTarget_add_includes,$(2),$(filter -I%,$(CPPUNIT_CFLAGS)))
+$(call gb_LinkTarget_set_defs,$(2), \
+    $$(DEFS) \
+    $(filter-out -I%,$(CPPUNIT_CFLAGS)) \
+)
+$(call gb_LinkTarget_set_ldflags,$(2),\
+    $$(LDFLAGS) \
+    $(CPPUNIT_LIBS) \
+)
+endif
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))