mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-11-15 17:12:14 +03:00
should fine
This commit is contained in:
52
.github/workflows/test-ci-windows.yml
vendored
52
.github/workflows/test-ci-windows.yml
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user