Merge pull request #16627 from QuLogic/azure-libpng

tacaswell · web-flow · commit 5345ab7a4ec0 · 2020-03-02T09:06:45.000-05:00
ci: Restore nuget install step on Azure for v3.2.x.
diff --git 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
