mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix glew on MSVC 14.0

Browse Source 
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 <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky
2016-03-12 01:01:48 +01:00
parent 65b4d2a618
commit 682da4010b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/glew/ExternalProject_glew.mk vendored
View File

@@ -17,10 +17,10 @@ ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_get_state_target,glew,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
$(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade glew.sln,echo up-to-date) && \ $(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) \ ,build/vc12) \
$(call gb_ExternalProject_run,build,\ $(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) ,build/vc12)
else else