From 6dc53495b38c4886307e7ee35ae1e185ed44f3bc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 2 Mar 2020 06:29:36 -0500 Subject: [PATCH] ci: Restore nuget install step on Azure for v3.2.x. This was removed in a cleanup on `master`, and backported to `v3.2.x`. While the cleanup was good, the `v3.2.x` branch still requires the use of libpng, so that step must be restored. --- azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3d80d682b196..a0dfea9c1ee0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,6 +81,12 @@ steps: brew install pkg-config ffmpeg imagemagick mplayer ccache ;; win32) + nuget install libpng-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)" + nuget install zlib-msvc14-x64 -ExcludeVersion -OutputDirectory "$(build.BinariesDirectory)" + echo ##vso[task.prependpath]$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\bin_release + echo ##vso[task.prependpath]$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\bin_release + echo ##vso[task.setvariable variable=CL]/I$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\include /I$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\include + echo ##vso[task.setvariable variable=LINK]/LIBPATH:$(build.BinariesDirectory)\libpng-msvc14-x64\build\native\lib_release /LIBPATH:$(build.BinariesDirectory)\zlib-msvc14-x64\build\native\lib_release ;; *) exit 1