[Libreoffice-commits] .: libcdr/ExternalProject_libcdr.mk

[Libreoffice Gerrit user]

 libcdr/ExternalProject_libcdr.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7f2fc6696eba3d16e07a2c4881b6ed000bc9795
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Dec 12 16:36:20 2012 +0200

    One more MSBuild build fix for VS 2012
    
    Don't know why others who have built with VS 2012 don't have this
    problem (?), but otherwise I get:
    
    Project "Q:\ooo\git\master\workdir\wntmsci14\UnpackedTarball\cdr\build\win32\libcdr.vcxproj" on node 1 (default targets).
    C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\Platforms\Win32\Microsoft.Cpp.Win32.Targets(518,5): error MSB8008: Specified platform toolset (v110) is not installed or invalid. Please make sure that a supported PlatformToolset value is selected. [Q:\ooo\git\master\workdir\wntmsci14\UnpackedTarball\cdr\build\win32\libcdr.vcxproj]
    Done Building Project "Q:\ooo\git\master\workdir\wntmsci14\UnpackedTarball\cdr\build\win32\libcdr.vcxproj" (default targets) -- FAILED.

diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f4dcab5..58465d5 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	&& export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
 	&& export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \
 	&& export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
-	&& msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \
+	&& msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \
 	&& touch $@
 endif