chore: Bump VCPKG on Windows; resolve build issues

This commit is contained in:
Atanas Janeshliev
2025-10-30 11:38:16 +01:00
parent 5a28fbf2df
commit 726eb72026
3 changed files with 26 additions and 1 deletions

View File

@ -57,6 +57,11 @@ if (APPLE) # We need to link the Cocoa framework for the dock icon.
find_library(COCOA_LIBRARY Cocoa REQUIRED)
endif()
if (WIN32)
add_compile_definitions(NOMINMAX) # Interference with grpc and msvc macros
add_compile_definitions(WIN32_LEAN_AND_MEAN)
endif()
#*****************************************************************************************************************************************************
# Qt

View File

@ -22,6 +22,26 @@ Write-host "Bridge-gui directory is $scriptDir"
Write-host "Bridge repos root dir $bridgeRepoRootDir"
Push-Location $scriptDir
# There is bug in CI caused by defining the lower case and upper case
# vars for proxy. For pure bash (case sensitive - creating
# two env items) or pure powershell (case insensitive - by default writes any
# changes into first defined env instance) it is transparent. But during bridge gui
# build we are populating case sensitive env vars from bash to powershell which
# then cause error when trying to list env vars. This is causing an error
# during CMake lookup for CXX and build fails. Therefore we need unset the
# lower case version if present.
Write-Host "Checking for duplicate proxy variables..."
@("HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY") | ForEach-Object {
$upper = $_
$lower = $_.ToLower()
if ((Test-Path "Env:$upper") -and (Test-Path "Env:$lower")) {
Write-Host "Removing duplicate lowercase variable: $lower"
Remove-Item "Env:$lower" -ErrorAction SilentlyContinue
}
}
$ErrorActionPreference = "Stop"