Skip to content

Commit d80aaff

Browse files
committed
fix
1 parent 436bc6e commit d80aaff

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,21 @@ jobs:
100100
- name: "Configure TileDB Core"
101101
if: inputs.libtiledb_ref
102102
run: |
103+
# Use vcpkg on Windows for dependency management
103104
if [[ "${{ runner.os }}" == "Windows" ]]; then
104-
BUILD_SHARED="OFF"
105+
VCPKG_TOOLCHAIN="-DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
105106
else
106-
BUILD_SHARED="ON"
107+
VCPKG_TOOLCHAIN=""
107108
fi
108109
cmake -S _tiledb_core -B _tiledb_core/build \
109110
-DCMAKE_BUILD_TYPE=Release \
110-
-DBUILD_SHARED_LIBS=${BUILD_SHARED} \
111+
-DBUILD_SHARED_LIBS=ON \
111112
-DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist" \
112113
-DTILEDB_INSTALL_LIBDIR=lib \
113114
-DTILEDB_S3=ON \
114115
-DTILEDB_SERIALIZATION=ON \
115-
-DTILEDB_TESTS=OFF
116+
-DTILEDB_TESTS=OFF \
117+
${VCPKG_TOOLCHAIN}
116118
117119
- name: "Build and Install TileDB Core"
118120
if: inputs.libtiledb_ref
@@ -126,6 +128,12 @@ jobs:
126128
export TILEDB_PATH="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist"
127129
python -m pip install --verbose .[test]
128130
131+
- name: "Add DLL paths to PATH (Windows only)"
132+
if: inputs.libtiledb_ref && runner.os == 'Windows'
133+
run: |
134+
echo "${{ github.workspace }}/_tiledb_core/dist/bin" >> $GITHUB_PATH
135+
echo "$VCPKG_ROOT/installed/x64-windows/bin" >> $GITHUB_PATH
136+
129137
- name: "Build and Install TileDB-Py (default)"
130138
if: ${{ !inputs.libtiledb_ref }}
131139
run: |

0 commit comments

Comments
 (0)