github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-15 17:12:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

should fine

Browse Source
This commit is contained in:
A13501350
2025-09-20 22:38:41 +08:00
parent 3dabde3ac6
commit 73531e9dfb
2 changed files with 6 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
.github/workflows/test-ci-windows.yml vendored
View File

@@ -104,54 +104,10 @@ jobs:
-DWITH_YAJL=ON ` -DWITH_YAJL=ON `
-S IIS -B "iis\build-${{ matrix.arch }}" -S IIS -B "iis\build-${{ matrix.arch }}"
$vcpkgIncludePath = "${{ github.workspace }}\iis\build-${{ matrix.arch }}\vcpkg_installed\${{ matrix.arch }}-windows\include" - name: Build IIS Module
Write-Host "Checking vcpkg include path: $vcpkgIncludePath" shell: pwsh
if (Test-Path -Path $vcpkgIncludePath) { run: |
Write-Host "vcpkg include path exists. Contents:" cmake --build "iis\build-${{ matrix.arch }}" --config Release
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: Package IIS Module with WiX # - name: Package IIS Module with WiX
# shell: pwsh # shell: pwsh

5
iis/CMakeLists.txt
View File

@@ -199,13 +199,12 @@ endif()
option(WITH_YAJL "Enable YAJL support" OFF) option(WITH_YAJL "Enable YAJL support" OFF)
if(WITH_YAJL) if(WITH_YAJL)
# Manually find YAJL if config.cmake is not available (e.g., from vcpkg) # 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 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 NO_DEFAULT_PATH
) )
find_library(YAJL_LIBRARY NAMES yajl 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 NO_DEFAULT_PATH
) )