From 7fe7ac0f04363b07b37bd4faa91671e7f6397f7d Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Thu, 29 Feb 2024 20:42:14 -0800 Subject: [PATCH] ci: Fix Windows CI, need to build newer openexr and adjust boost search (#4167) Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 2 +- src/build-scripts/gh-win-installdeps.bash | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 700f21ff97..e7bf32c5eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -541,7 +541,7 @@ jobs: runner: windows-2019 vsver: 2019 generator: "Visual Studio 16 2019" - openexr_ver: v2.5.8 + openexr_ver: v3.2.2 python_ver: 3.7 simd: sse4.2 # - desc: windows-2022 diff --git a/src/build-scripts/gh-win-installdeps.bash b/src/build-scripts/gh-win-installdeps.bash index ddfc69ed3b..cc46a2747c 100755 --- a/src/build-scripts/gh-win-installdeps.bash +++ b/src/build-scripts/gh-win-installdeps.bash @@ -57,7 +57,8 @@ time vcpkg install boost-stacktrace:x64-windows time vcpkg install boost-system:x64-windows time vcpkg install boost-thread:x64-windows -# # vcpkg install zlib:x64-windows +#vcpkg install libdeflate:x64-windows +#vcpkg install zlib:x64-windows vcpkg install tiff:x64-windows # vcpkg install libpng:x64-windows # vcpkg install giflib:x64-windows @@ -81,7 +82,7 @@ vcpkg install libjpeg-turbo:x64-windows # # # export PATH="$PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin" # export PATH="$DEP_DIR/lib:$DEP_DIR/bin:$PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib" -export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib" +export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows" # export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib:$DEP_DIR/lib:$DEP_DIR/bin" # echo "All VCPkg installs:"