openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1733842 - in /openoffice/branches/gbuild-reintegration: ./ main/basegfx/GoogleTest_basegfx.mk main/basegfx/Library_basegfx.mk
Date Sun, 06 Mar 2016 20:36:47 GMT
Author: damjan
Date: Sun Mar  6 20:36:47 2016
New Revision: 1733842

URL: http://svn.apache.org/viewvc?rev=1733842&view=rev
Log:
Merge r1409508 from branches/gbuild:
CWS gnumake4: must link against stl

Also ported CppUnit changes to GTest.

BUILDS

Build updates by: me


Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk
    openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  6 20:36:47 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409507
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409508
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk?rev=1733842&r1=1733841&r2=1733842&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk Sun Mar  6
20:36:47 2016
@@ -42,6 +42,7 @@ $(eval $(call gb_GoogleTest_add_exceptio
 $(eval $(call gb_GoogleTest_add_linked_libs,basegfx_test, \
 	basegfx \
 	sal \
+	stl \
 	cppuhelper \
 	cppu \
     $(gb_STDLIBS) \

Modified: openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk?rev=1733842&r1=1733841&r2=1733842&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/Library_basegfx.mk Sun Mar  6 20:36:47
2016
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_set_defs,basegf
 
 $(eval $(call gb_Library_add_linked_libs,basegfx,\
 	sal \
+	stl \
 	cppu \
 	cppuhelper \
     $(gb_STDLIBS) \



Mime
View raw message