Author: damjan
Date: Mon Feb 22 03:04:44 2016
New Revision: 1731585
URL: http://svn.apache.org/viewvc?rev=1731585&view=rev
Log:
Fix makefiles for compheler unit tests.
Patch by: me
Modified:
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
Modified:
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk?rev=1731585&r1=1731584&r2=1731585&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_string.mk
Mon Feb 22 03:04:44 2016
@@ -40,10 +40,13 @@ $(eval $(call gb_GoogleTest_set_include,
$$(INCLUDE) \
-I$(SRCDIR)/formula/inc \
-I$(SRCDIR)/comphelper/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_GoogleTest_add_api,comphelper_string,\
+ udkapi \
+))
+
$(eval $(call gb_GoogleTest_set_ldflags,comphelper_string,\
$$(LDFLAGS) \
))
Modified:
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk?rev=1731585&r1=1731584&r2=1731585&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/comphelper/GoogleTest_comphelper_weakbag.mk
Mon Feb 22 03:04:44 2016
@@ -39,10 +39,13 @@ $(eval $(call gb_GoogleTest_set_include,
$$(INCLUDE) \
-I$(SRCDIR)/formula/inc \
-I$(SRCDIR)/comphelper/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_GoogleTest_add_api,comphelper_weakbag,\
+ udkapi \
+))
+
$(eval $(call gb_GoogleTest_set_ldflags,comphelper_weakbag,\
$$(LDFLAGS) \
))
