tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-31 01:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts with support/2.13

Browse Source 
This reverts commit 5ea8dcf471fcfa5d9a2c4b4ff3371a46b5aac228
which has already been cherry-picked there, but is also needed for v2.13.10.

This has the same effect as `git merge support/2.13`, but involves no merge,
no conflict resolution, less commits and a smaller diff.
This commit is contained in:
Alexander A. Klimov 2024-10-22 12:17:30 +02:00
parent 0eb2949923
commit 6b362d6c93
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/win-dev.ps1
View File

@ -14,7 +14,7 @@ function ThrowOnNativeFailure {
$VsVersion = 2019
$MsvcVersion = '14.2'
$BoostVersion = @(1, 83, 0)
$OpensslVersion = '3_0_15'
$OpensslVersion = '3_0_12'
switch ($Env:BITS) {
32 { }

2
tools/win32/configure.ps1
View File

@ -30,7 +30,7 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
}
}
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_15-Win${env:BITS}"
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_12-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_ROOT)) {
$env:BOOST_ROOT = "c:\local\boost_1_83_0-Win${env:BITS}"