[Libreoffice-commits] .: cppunit/ExternalProject_cppunit.mk

2012-12-12 Thread Libreoffice Gerrit user 
 cppunit/ExternalProject_cppunit.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 94a1b9c46fc76126296b298aa5447e5217a69ee3
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Dec 12 13:37:09 2012 +0200

Fix VS2012 build at least for me

diff --git a/cppunit/ExternalProject_cppunit.mk 
b/cppunit/ExternalProject_cppunit.mk
index b5abe41..02cccb3 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -28,10 +28,10 @@ else
 $(call gb_ExternalProject_get_state_target,cppunit,build) :
cd $(EXTERNAL_WORKDIR)/src/cppunit \
 msbuild.exe cppunit_dll.vcxproj /p:Configuration=Release \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
 cd ../DllPlugInTester \
 msbuild.exe DllPlugInTester.vcxproj /p:Configuration=Release \
-   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
 touch $@
 endif
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppunit/ExternalProject_cppunit.mk

2012-12-06 Thread Libreoffice Gerrit user 
 cppunit/ExternalProject_cppunit.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b66e034904c7d5b0aa60170240deebc84811aa16
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Dec 7 08:15:58 2012 +0100

cppunit is PLAINLIBS_NONE

Change-Id: Id6401999d20069f17133a765195cd49b50ff532f

diff --git a/cppunit/ExternalProject_cppunit.mk 
b/cppunit/ExternalProject_cppunit.mk
index b52bb4e..b5abe41 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) :
--disable-html-docs \
--disable-latex-docs \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
+   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__NONE)
 \
$(if $(filter-out WNT,$(OS)),,CXXFLAGS=-mthreads 
LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2) \
$(if $(filter SOLARIS,$(OS)),LIBS=-lm) \
$(if $(filter ANDROID,$(OS)),LIBS=-lgnustl_shared -lm) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits