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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Dec 12 03:39:46 PST 2012


 cppunit/ExternalProject_cppunit.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 94a1b9c46fc76126296b298aa5447e5217a69ee3
Author: Tor Lillqvist <tlillqvist at 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


More information about the Libreoffice-commits mailing list