add zlib, libxml2 to llvm Windows distro

Author: mamoreau-devolutions

.github/workflows/halide-prebuilt.yml

@@ -21,7 +21,7 @@ jobs:
           - os: windows
             runner: windows-2022
           - os: macos
-            runner: macos-12
+            runner: macos-latest
           - os: ubuntu-20.04
             runner: ubuntu-20.04
           - os: ubuntu-22.04
@@ -109,7 +109,7 @@ jobs:
           }
 
           echo "LLVM_HOST_BIN_DIR=$LLVM_BIN_DIR" >> $Env:GITHUB_ENV
-          echo "PATH=$LLVM_BIN_DIR$([IO.Path]::PathSeparator)$Env:PATH" >> $Env:GITHUB_ENV
+          #echo "PATH=$LLVM_BIN_DIR$([IO.Path]::PathSeparator)$Env:PATH" >> $Env:GITHUB_ENV
 
       - name: Install target clang+llvm
         if: matrix.arch == 'aarch64'
@@ -172,6 +172,10 @@ jobs:
         run: |
           if ($IsWindows) {
             Enter-VsDevShell x64
+            $CMAKE_MT = (Get-Command -Type Application mt).Source
+            $CMAKE_MT = cmd /c "for %A in (`"$CMAKE_MT`") do @echo %~sA" 2>&1 | Out-String
+            $CMAKE_MT = ($CMAKE_MT -Replace '\r|\n', '' -Replace '\\', '/').Trim()
+            echo "CMAKE_MT=$CMAKE_MT" >> $Env:GITHUB_ENV
           }
 
           cmake -G Ninja -S halide -B halide-host `
@@ -213,6 +217,10 @@ jobs:
           $CMakeArgs += @("-DTARGET_WEBASSEMBLY=ON")
           $CMakeArgs += @("-Wno-dev")
 
+          if ($IsWindows) {
+            $CMakeArgs += @("-DCMAKE_MT=${Env:CMAKE_MT}")
+          }
+
           if ('${{matrix.os}}' -eq 'macos') {
             $AppleArch = @{'x86_64'='x86_64';'aarch64'='arm64'}['${{matrix.arch}}']
             $CMakeArgs += @("-DCMAKE_OSX_ARCHITECTURES=`"$AppleArch`"")

.github/workflows/llvm-prebuilt.yml

@@ -43,7 +43,16 @@ jobs:
       - name: Configure Windows runner
         if: runner.os == 'Windows'
         run: |
-          choco install ninja 7zip
+          choco install --no-progress ninja 7zip
+          git clone https://github.com/microsoft/vcpkg.git
+          cd vcpkg
+          .\bootstrap-vcpkg.bat
+          $VcpkgRootDir = "$PWD/vcpkg" -Replace '\\','/'
+          $VcpkgArch = @{'x86_64'='x64';'aarch64'='arm64'}['${{matrix.arch}}']
+          .\vcpkg install "zlib:${VcpkgArch}-windows-static-release"
+          .\vcpkg install "libxml2:${VcpkgArch}-windows-static-release"
+          echo "VCPKG_ARCH=$VcpkgArch" >> $Env:GITHUB_ENV
+          echo "VCPKG_ROOT_DIR=$VcpkgRootDir" >> $Env:GITHUB_ENV
 
       - name: Configure macOS runner
         if: runner.os == 'macOS'
@@ -162,6 +171,24 @@ jobs:
 
           $CMakeArgs = @()
 
+          if ('${{matrix.os}}' -eq 'windows') {
+            $ZLIB_ROOT_DIR="${Env:VCPKG_ROOT_DIR}/packages/zlib_${Env:VCPKG_ARCH}-windows-static"
+            $ZLIB_INCLUDE_DIR="$ZLIB_ROOT_DIR/include"
+            $ZLIB_LIBRARY="$ZLIB_ROOT_DIR/lib/zlib.lib"
+            $CMakeArgs += @(
+              "-DZLIB_INCLUDE_DIR=$ZLIB_INCLUDE_DIR",
+              "-DZLIB_LIBRARY=$ZLIB_LIBRARY"
+            )
+
+            $LIBXML2_ROOT_DIR="${Env:VCPKG_ROOT_DIR}/packages/libxml2_${Env:VCPKG_ARCH}-windows-static"
+            $LIBXML2_INCLUDE_DIR="$LIBXML2_ROOT_DIR/include"
+            $LIBXML2_LIBRARY="$LIBXML2_ROOT_DIR/lib/libxml2.lib"
+            $CMakeArgs += @(
+              "-DLIBXML2_INCLUDE_DIR=$LIBXML2_INCLUDE_DIR",
+              "-DLIBXML2_LIBRARY=$LIBXML2_LIBRARY"
+            )
+          }
+
           if ('${{matrix.os}}' -eq 'macos') {
             $AppleArch = @{'x86_64'='x86_64';'aarch64'='arm64'}['${{matrix.arch}}']
             $CMakeArgs += @("-DCMAKE_OSX_ARCHITECTURES=$AppleArch")

cmake/llvm-distribution.cmake

@@ -59,11 +59,7 @@ set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "")
 set(LLVM_ENABLE_DIA_SDK OFF CACHE BOOL "")
 set(LLVM_ENABLE_TERMINFO OFF CACHE BOOL "")
 set(LLVM_ENABLE_LIBXML2 ON CACHE BOOL "")
-if(NOT WINDOWS)
-    set(LLVM_ENABLE_ZLIB ON CACHE BOOL "")
-else()
-    set(LLVM_ENABLE_ZLIB OFF CACHE BOOL "")
-endif()
+set(LLVM_ENABLE_ZLIB ON CACHE BOOL "")
 set(LLVM_ENABLE_ZSTD OFF CACHE BOOL "")
 set(LLVM_ENABLE_UNWIND_TABLES OFF CACHE BOOL "")
 set(LLVM_ENABLE_Z3_SOLVER OFF CACHE BOOL "")