From 682da4010b45cbb3268ea8b2b3da455bca413acd Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 12 Mar 2016 01:01:48 +0100 Subject: Fix glew 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: I5849821f291b705ad75db8b4c9404af8458902ba Reviewed-on: https://gerrit.libreoffice.org/23160 Tested-by: Jenkins Reviewed-by: David Ostrovsky --- external/glew/ExternalProject_glew.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'external') diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index bb78dce2977e..0d80cd03bd33 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -17,10 +17,10 @@ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,build,\ $(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade glew.sln,echo up-to-date) && \ - msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \ ,build/vc12) \ $(call gb_ExternalProject_run,build,\ - msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release \ + msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=Release $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140,/p:PlatformToolset=v120) \ ,build/vc12) else -- cgit