external/cppunit/ExternalProject_cppunit.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 729e26426c88f9bba7e4d9b79d43fb4c9553d179
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Tue Jul 8 23:44:29 2014 +0200
VS2013: Adjust cppunit to 12.0 vcproj version
Change-Id: I9223fc0620bf31389ab4ea0971835dd7a27feb7e
Reviewed-on: https://gerrit.libreoffice.org/10159
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/cppunit/ExternalProject_cppunit.mk
b/external/cppunit/ExternalProject_cppunit.mk
index 9e67828..5c62c96 100644
--- a/external/cppunit/ExternalProject_cppunit.mk
+++ b/external/cppunit/ExternalProject_cppunit.mk
@@ -17,8 +17,9 @@ ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
- /p:VisualStudioVersion=11.0)" \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
+ /p:VisualStudioVersion=11.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0)" \
&& msbuild.exe cppunit_dll.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
&& cd ../DllPlugInTester \
&& msbuild.exe DllPlugInTester.vcxproj
/p:Configuration=$${PROFILEFLAGS} \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
