mirror of
https://github.com/Icinga/icinga2.git
synced 2025-09-23 09:48:05 +02:00
Merge pull request #10537 from Icinga/Boost1.89
Bump Boost shipped for Windows to v1.89
This commit is contained in:
commit
0ecbfa93dd
@ -172,7 +172,7 @@ else()
|
||||
set(LOGROTATE_CREATE "\n\tcreate 644 ${ICINGA2_USER} ${ICINGA2_GROUP}")
|
||||
endif()
|
||||
|
||||
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS coroutine context date_time filesystem iostreams thread system program_options regex REQUIRED)
|
||||
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS coroutine context date_time filesystem iostreams thread program_options regex REQUIRED)
|
||||
|
||||
# Boost.Coroutine2 (the successor of Boost.Coroutine)
|
||||
# (1) doesn't even exist in old Boost versions and
|
||||
|
@ -13,7 +13,7 @@ function ThrowOnNativeFailure {
|
||||
|
||||
$VsVersion = 2022
|
||||
$MsvcVersion = '14.3'
|
||||
$BoostVersion = @(1, 88, 0)
|
||||
$BoostVersion = @(1, 89, 0)
|
||||
$OpensslVersion = '3_0_16'
|
||||
|
||||
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_88_0'
|
||||
$env:BOOST_ROOT = 'c:\local\boost_1_89_0'
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
|
||||
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_88_0\lib64-msvc-14.3'
|
||||
$env:BOOST_LIBRARYDIR = 'c:\local\boost_1_89_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_16-Win${env:BITS}"
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_ROOT)) {
|
||||
$env:BOOST_ROOT = "c:\local\boost_1_88_0-Win${env:BITS}"
|
||||
$env:BOOST_ROOT = "c:\local\boost_1_89_0-Win${env:BITS}"
|
||||
}
|
||||
if (-not (Test-Path env:BOOST_LIBRARYDIR)) {
|
||||
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_88_0-Win${env:BITS}\lib${env:BITS}-msvc-14.3"
|
||||
$env:BOOST_LIBRARYDIR = "c:\local\boost_1_89_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…
x
Reference in New Issue
Block a user