From 73531e9dfbe5d4c665d80dca59050fc929a02752 Mon Sep 17 00:00:00 2001 From: A13501350 <18516149786@163.com> Date: Sat, 20 Sep 2025 22:38:41 +0800 Subject: [PATCH] should fine --- .github/workflows/test-ci-windows.yml | 52 +++------------------------ iis/CMakeLists.txt | 5 ++- 2 files changed, 6 insertions(+), 51 deletions(-) diff --git a/.github/workflows/test-ci-windows.yml b/.github/workflows/test-ci-windows.yml index 4020d2b5..d7d966f0 100644 --- a/.github/workflows/test-ci-windows.yml +++ b/.github/workflows/test-ci-windows.yml @@ -104,54 +104,10 @@ jobs: -DWITH_YAJL=ON ` -S IIS -B "iis\build-${{ matrix.arch }}" - $vcpkgIncludePath = "${{ github.workspace }}\iis\build-${{ matrix.arch }}\vcpkg_installed\${{ matrix.arch }}-windows\include" - Write-Host "Checking vcpkg include path: $vcpkgIncludePath" - if (Test-Path -Path $vcpkgIncludePath) { - Write-Host "vcpkg include path exists. Contents:" - Get-ChildItem -Path $vcpkgIncludePath - } else { - Write-Host "vcpkg include path does not exist." - } - - $vcpkgIncludePath = "${{ github.workspace }}\iis\build\vcpkg_installed\${{ matrix.arch }}-windows\include" - Write-Host "Checking vcpkg include path: $vcpkgIncludePath" - if (Test-Path -Path $vcpkgIncludePath) { - Write-Host "vcpkg include path exists. Contents:" - Get-ChildItem -Path $vcpkgIncludePath - } else { - Write-Host "vcpkg include path does not exist." - } - - $vcpkgIncludePath = "${{ github.workspace }}\build-${{ matrix.arch }}\vcpkg_installed\${{ matrix.arch }}-windows\include" - Write-Host "Checking vcpkg include path: $vcpkgIncludePath" - if (Test-Path -Path $vcpkgIncludePath) { - Write-Host "vcpkg include path exists. Contents:" - Get-ChildItem -Path $vcpkgIncludePath - } else { - Write-Host "vcpkg include path does not exist." - } - - $vcpkgIncludePath = "${{ github.workspace }}\build\vcpkg_installed\${{ matrix.arch }}-windows\include" - Write-Host "Checking vcpkg include path: $vcpkgIncludePath" - if (Test-Path -Path $vcpkgIncludePath) { - Write-Host "vcpkg include path exists. Contents:" - Get-ChildItem -Path $vcpkgIncludePath - } else { - Write-Host "vcpkg include path does not exist." - } - - $vcpkgIncludePath = "${{ github.workspace }}\iis\vcpkg_installed\${{ matrix.arch }}-windows\include" - Write-Host "Checking vcpkg include path: $vcpkgIncludePath" - if (Test-Path -Path $vcpkgIncludePath) { - Write-Host "vcpkg include path exists. Contents:" - Get-ChildItem -Path $vcpkgIncludePath - } else { - Write-Host "vcpkg include path does not exist." - } - # - name: Build IIS Module - # shell: pwsh - # run: | - # cmake --build "iis\build-${{ matrix.arch }}" --config Release + - name: Build IIS Module + shell: pwsh + run: | + cmake --build "iis\build-${{ matrix.arch }}" --config Release # - name: Package IIS Module with WiX # shell: pwsh diff --git a/iis/CMakeLists.txt b/iis/CMakeLists.txt index b92acf82..9366dc7d 100644 --- a/iis/CMakeLists.txt +++ b/iis/CMakeLists.txt @@ -199,13 +199,12 @@ endif() option(WITH_YAJL "Enable YAJL support" OFF) if(WITH_YAJL) # Manually find YAJL if config.cmake is not available (e.g., from vcpkg) - message(Finding YAJL in ${CMAKE_CURRENT_SOURCE_DIR}/build/vcpkg_installed/${ARCHITECTURE}-windows/include) find_path(YAJL_INCLUDE_DIR yajl/yajl_common.h - PATHS "${CMAKE_CURRENT_SOURCE_DIR}/build/vcpkg_installed/${ARCHITECTURE}-windows/include" + PATHS "${CMAKE_CURRENT_SOURCE_DIR}/build-${ARCHITECTURE}/vcpkg_installed/${ARCHITECTURE}-windows/include" NO_DEFAULT_PATH ) find_library(YAJL_LIBRARY NAMES yajl - PATHS "${CMAKE_CURRENT_SOURCE_DIR}/build/vcpkg_installed/${ARCHITECTURE}-windows/lib" + PATHS "${CMAKE_CURRENT_SOURCE_DIR}/build-${ARCHITECTURE}/vcpkg_installed/${ARCHITECTURE}-windows/lib" NO_DEFAULT_PATH )