From 08cbd6497591d4ee60f584bc92485ffb95e531ed Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Fri, 22 Jan 2021 18:59:57 -0800 Subject: [PATCH] Windows CI: get tiff-suite test passing on Windows We were failing this test because of lack of JPEG support in the TIFF we were building. Rather than fight it, just use vcpkg to get tiff. --- src/build-scripts/gh-win-installdeps.bash | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/build-scripts/gh-win-installdeps.bash b/src/build-scripts/gh-win-installdeps.bash index c0eec40f47..922abcc2d2 100755 --- a/src/build-scripts/gh-win-installdeps.bash +++ b/src/build-scripts/gh-win-installdeps.bash @@ -59,7 +59,7 @@ echo "---------------" # vcpkg update # # # vcpkg install zlib:x64-windows -# vcpkg install tiff:x64-windows +vcpkg install tiff:x64-windows # vcpkg install libpng:x64-windows # vcpkg install giflib:x64-windows vcpkg install freetype:x64-windows @@ -103,13 +103,15 @@ export ZLIB_ROOT=$PWD/ext/dist src/build-scripts/build_libpng.bash export PNG_ROOT=$PWD/ext/dist -src/build-scripts/build_libtiff.bash -export TIFF_ROOT=$PWD/ext/dist +# We're currently getting libtiff from vcpkg +#src/build-scripts/build_libtiff.bash +#export TIFF_ROOT=$PWD/ext/dist -LIBJPEGTURBO_CONFIG_OPTS=-DWITH_SIMD=OFF -# ^^ because we're too lazy to build nasm -src/build-scripts/build_libjpeg-turbo.bash -export JPEGTurbo_ROOT=$PWD/ext/dist +# We're currently getting jpeg from vcpkg +# LIBJPEGTURBO_CONFIG_OPTS=-DWITH_SIMD=OFF +# # ^^ because we're too lazy to build nasm +# src/build-scripts/build_libjpeg-turbo.bash +# export JPEGTurbo_ROOT=$PWD/ext/dist source src/build-scripts/build_pybind11.bash #export pybind11_ROOT=$PWD/ext/dist