external/lcms2/ExternalProject_lcms2.mk | 1 + 1 file changed, 1 insertion(+)
New commits: commit 3bd54fd17bddea8b7460279153209729a54c9369 Author: David Ostrovsky <[email protected]> Date: Sat Mar 12 08:20:32 2016 +0100 Fix lcms2 on MSVC 14.0 Without explicitly specifying toolset v140, the build was failing when only MSVC 14.0 was installed: The builds tools for v120 (Platform Toolset = 'v120') cannot be found Change-Id: I6fb386d56e38cbf922de5069e70a3d3def147c0b Reviewed-on: https://gerrit.libreoffice.org/23162 Reviewed-by: David Ostrovsky <[email protected]> Tested-by: Jenkins <[email protected]> diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 6bf69b3..981c1e6 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -19,6 +19,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): $(call gb_ExternalProject_run,build,\ $(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade lcms2_DLL.vcxproj,echo up-to-date) && \ MSBuild.exe lcms2_DLL.vcxproj \ + $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \ ,Projects/VC2013/lcms2_DLL) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
