mirror of
https://github.com/Icinga/icinga2.git
synced 2026-02-03 20:40:17 -05:00
Merge pull request #10669 from Icinga/Boost1.90
Bump Boost shipped for Windows to v1.90
This commit is contained in:
commit
0f369a534d
3 changed files with 5 additions and 5 deletions
|
|
@ -13,7 +13,7 @@ function ThrowOnNativeFailure {
|
|||
|
||||
$VsVersion = 2022
|
||||
$MsvcVersion = '14.3'
|
||||
$BoostVersion = @(1, 89, 0)
|
||||
$BoostVersion = @(1, 90, 0)
|
||||
$OpensslVersion = '3_0_18'
|
||||
|
||||
switch ($Env:BITS) {
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
|
|||
$env:OPENSSL_ROOT_DIR = 'c:\local\OpenSSL-Win64'
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_ROOT)) {
|
||||
$env:BOOST_ROOT = 'c:\local\boost_1_89_0'
|
||||
$env:BOOST_ROOT = 'c:\local\boost_1_90_0'
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
|
||||
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_89_0\lib64-msvc-14.3'
|
||||
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_90_0\lib64-msvc-14.3'
|
||||
}
|
||||
if (-not (Test-Path env:FLEX_BINARY)) {
|
||||
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
|
|||
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_18-Win${env:BITS}"
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_ROOT)) {
|
||||
$env:BOOST_ROOT = "c:\local\boost_1_89_0-Win${env:BITS}"
|
||||
$env:BOOST_ROOT = "c:\local\boost_1_90_0-Win${env:BITS}"
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
|
||||
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_89_0-Win${env:BITS}\lib${env:BITS}-msvc-14.3"
|
||||
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_90_0-Win${env:BITS}\lib${env:BITS}-msvc-14.3"
|
||||
}
|
||||
if (-not (Test-Path env:FLEX_BINARY)) {
|
||||
$env:FLEX_BINARY = 'C:\ProgramData\chocolatey\bin\win_flex.exe'
|
||||
|
|
|
|||
Loading…
Reference in a new issue