Skip to content

Commit 2d14ba2

Browse files
committed
try vcpkgs
1 parent 544beca commit 2d14ba2

3 files changed

Lines changed: 14 additions & 1 deletion

File tree

.github/workflows/_build_windows.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,16 @@ jobs:
3535
SPDL_BUILD_STUB: 1
3636
shell: bash
3737
run: |
38+
set -x
39+
3840
# choco does not have a zlib
3941
# choco install zlib -y
42+
vcpkg install zlib
43+
find C:/vcpkg/packages/zlib_x64-windows/
44+
echo "${VCPKG_ROOT}"
45+
export CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
46+
find C:/vcpkg/scripts/buildsystems/
47+
find C:/vcpkg/installed/x64-windows/
4048
4149
curl -LsSf https://astral.sh/uv/install.sh | sh
4250
set -ex

packaging/spdl_io/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ def _b(var):
113113
"-DSPDL_BUILD_PYTHON_BINDING=ON",
114114
f"-DSPDL_PYTHON_BINDING_INSTALL_PREFIX={install_dir}",
115115
f"-DSPDL_IS_GIL_ENABLED={_b(_is_gil_enabled())}",
116+
"-DCMAKE_TOOLCHAIN_FILE=C:\\vcpkg\scripts\\buildsystems\\vcpkg.cmake",
116117
###################################################################
117118
# Options based on env vars
118119
###################################################################

src/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ message(STATUS "########################################")
4141
find_package(fmt REQUIRED NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY)
4242
find_package(glog REQUIRED NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY)
4343
find_package(libdeflate REQUIRED NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_SYSTEM_PACKAGE_REGISTRY)
44-
find_package(ZLIB 1.1.2 REQUIRED)
44+
45+
set(ZLIB_DIR "C:/vcpkg/packages/zlib_x64-windows")
46+
set(CMAKE_FIND_DEBUG_MODE TRUE)
47+
find_package(ZLIB 1.1.2 REQUIRED
48+
HINTS "C:/vcpkg/packages/zlib_x64-windows")
4549

4650
add_subdirectory(third_party/ffmpeg/multi)
4751
if (SPDL_USE_TRACING)

0 commit comments

Comments
 (0)