[Libreoffice-commits] core.git: external/lcms2

[David Ostrovsky]

 external/lcms2/ExternalProject_lcms2.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a21d0d7d5c3886b6ae9b5a2f7241d1a4a7846f08
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Tue Jul 8 21:44:12 2014 +0200

    VS2013: Adjust lcms2 to 12.0 vcproj version
    
    Change-Id: I5ec1ea40e57c7d9de337645421be89e1e4c5a867
    Reviewed-on: https://gerrit.libreoffice.org/10157
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index 1712c96..fa61bb7 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -20,7 +20,8 @@ $(call gb_ExternalProject_get_state_target,lcms2,build):
 		MSBuild.exe lcms2_DLL.vcxproj \
 			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 			/p:Platform=Win32 /p:TargetName=lcms2 \
-			$(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) \
 	,Projects/VC2010/lcms2_DLL)
 else
 $(call gb_ExternalProject_get_state_target,lcms2,build):