diff --git a/pyproject.toml b/pyproject.toml index 2235986..c312d49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ manylinux-x86_64-image = "manylinux_2_28" manylinux-aarch64-image = "manylinux_2_28" [tool.cibuildwheel.windows] -environment = { SKBUILD_CMAKE_ARGS="-DLLVM_DIR=$(pwd)/llvm-build/lib/cmake/llvm;-DZLIB_ROOT=C:/ProgramData/chocolatey/lib/zlib"} +environment = { SKBUILD_CMAKE_ARGS="-DLLVM_DIR=$(pwd)/llvm-build/lib/cmake/llvm;-DZLIB_ROOT=$VCPKG_INSTALLATION_ROOT/installed/x64-windows/share/zlib" } [tool.cibuildwheel.macos.environment] # Needed for full C++17 support diff --git a/scripts/action/install_llvm.sh b/scripts/action/install_llvm.sh index efd09d7..18f66f6 100644 --- a/scripts/action/install_llvm.sh +++ b/scripts/action/install_llvm.sh @@ -27,10 +27,7 @@ elif [[ "$sys" == "Msys" ]]; then root_llvm_dir_name="clang+llvm-18.1.8-x86_64-pc-windows-msvc" # install libraries - choco install zlib -y - pwd - ls -lht - echo $LLVM_DIR + vcpkg install zlib # MacOS elif [[ "$sys" == "Darwin" ]]; then # Mac (only for 14 or later, i.e. apple silicon) @@ -45,3 +42,7 @@ curl -L -o ./llvm-build.tar.xz "$url" tar -xf ./llvm-build.tar.xz mv "$root_llvm_dir_name" ./llvm-build +ls +pwd + +