Skip to content

Commit 7fe7ac0

Browse files
authored
ci: Fix Windows CI, need to build newer openexr and adjust boost search (#4167)
Signed-off-by: Larry Gritz <[email protected]>
1 parent 42f2faa commit 7fe7ac0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ jobs:
541541
runner: windows-2019
542542
vsver: 2019
543543
generator: "Visual Studio 16 2019"
544-
openexr_ver: v2.5.8
544+
openexr_ver: v3.2.2
545545
python_ver: 3.7
546546
simd: sse4.2
547547
# - desc: windows-2022

src/build-scripts/gh-win-installdeps.bash

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ time vcpkg install boost-stacktrace:x64-windows
5757
time vcpkg install boost-system:x64-windows
5858
time vcpkg install boost-thread:x64-windows
5959

60-
# # vcpkg install zlib:x64-windows
60+
#vcpkg install libdeflate:x64-windows
61+
#vcpkg install zlib:x64-windows
6162
vcpkg install tiff:x64-windows
6263
# vcpkg install libpng:x64-windows
6364
# vcpkg install giflib:x64-windows
@@ -81,7 +82,7 @@ vcpkg install libjpeg-turbo:x64-windows
8182
#
8283
# # export PATH="$PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
8384
# export PATH="$DEP_DIR/lib:$DEP_DIR/bin:$PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
84-
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
85+
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
8586
# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib:$DEP_DIR/lib:$DEP_DIR/bin"
8687
#
8788
echo "All VCPkg installs:"

0 commit comments

Comments
 (0)