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

[Michael Stahl]

 external/lcms2/ExternalProject_lcms2.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit aa7390652bbc3f80907707bd4aebcf2ea8a413c7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Mar 7 12:30:53 2017 +0100

    lcms2: try to get rid of $(DEVENV) /Upgrade
    
    It's not clear to me that this is actually required, particularly why it
    would be required for VS 2015 but not VS 2017, and why only for this
    external and not the others that use MSBuild.exe.
    
    Reportedly this can fail if you have an expired or not yet registered VS,
    while strangely enough everything else compiles fine in that case,
    so rather than try to find out how to check for that issue in configure,
    avoid the problem by removing the /Upgrade.
    
    Change-Id: I55566e109e57117f65febb91de7580667c984a54
    Reviewed-on: https://gerrit.libreoffice.org/34947
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk
index e1beee8..250255f 100644
--- a/external/lcms2/ExternalProject_lcms2.mk
+++ b/external/lcms2/ExternalProject_lcms2.mk
@@ -17,7 +17,6 @@ ifeq ($(COM),MSC)
 
 $(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 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
 			$(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \