ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

lcms2: try to get rid of $(DEVENV) /Upgrade

Browse Source 
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@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Michael Stahl
2017-03-07 12:45:50 +00:00
parent 4722bb82f8
commit aa7390652b
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/lcms2/ExternalProject_lcms2.mk
Vendored
-1
View File
@@ -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) \