Skip to content

Commit 2a30ab9

Browse files
committed
fix
1 parent d80aaff commit 2a30ab9

File tree

1 file changed

+22
-10
lines changed

1 file changed

+22
-10
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,31 @@ jobs:
102102
run: |
103103
# Use vcpkg on Windows for dependency management
104104
if [[ "${{ runner.os }}" == "Windows" ]]; then
105-
VCPKG_TOOLCHAIN="-DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
105+
VCPKG_TOOLCHAIN="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
106106
else
107107
VCPKG_TOOLCHAIN=""
108108
fi
109-
cmake -S _tiledb_core -B _tiledb_core/build \
110-
-DCMAKE_BUILD_TYPE=Release \
111-
-DBUILD_SHARED_LIBS=ON \
112-
-DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist" \
113-
-DTILEDB_INSTALL_LIBDIR=lib \
114-
-DTILEDB_S3=ON \
115-
-DTILEDB_SERIALIZATION=ON \
116-
-DTILEDB_TESTS=OFF \
117-
${VCPKG_TOOLCHAIN}
109+
110+
if [[ -n "$VCPKG_TOOLCHAIN" ]]; then
111+
cmake -S _tiledb_core -B _tiledb_core/build \
112+
-DCMAKE_BUILD_TYPE=Release \
113+
-DBUILD_SHARED_LIBS=ON \
114+
-DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist" \
115+
-DTILEDB_INSTALL_LIBDIR=lib \
116+
-DTILEDB_S3=ON \
117+
-DTILEDB_SERIALIZATION=ON \
118+
-DTILEDB_TESTS=OFF \
119+
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_TOOLCHAIN"
120+
else
121+
cmake -S _tiledb_core -B _tiledb_core/build \
122+
-DCMAKE_BUILD_TYPE=Release \
123+
-DBUILD_SHARED_LIBS=ON \
124+
-DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE//\\//}/_tiledb_core/dist" \
125+
-DTILEDB_INSTALL_LIBDIR=lib \
126+
-DTILEDB_S3=ON \
127+
-DTILEDB_SERIALIZATION=ON \
128+
-DTILEDB_TESTS=OFF
129+
fi
118130
119131
- name: "Build and Install TileDB Core"
120132
if: inputs.libtiledb_ref

0 commit comments

Comments
 (0)