tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9787 from Icinga/OpenSSL30 

Windows: bump OpenSSL v1.1 (soon EOL) -> v3.0
This commit is contained in:
Alexander Aleksandrovič Klimov 2023-07-07 10:17:17 +02:00 committed by GitHub
parent 681f9eed62 c070e95b03
commit 2e4af46d46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -512,16 +512,16 @@ set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
include(InstallRequiredSystemLibraries) include(InstallRequiredSystemLibraries)
if(WIN32) if(WIN32)
if (OPENSSL_VERSION_MINOR GREATER_EQUAL 1) if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64")
if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") set(ICINGA2_OPENSSL_DLL_ARCH "-x64")
list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1-x64.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1-x64.dll)
else()
list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1.dll)
endif()
else() else()
list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libeay32.dll ${OPENSSL_INCLUDE_DIR}/../bin/ssleay32.dll) set(ICINGA2_OPENSSL_DLL_ARCH "")
endif() endif()
foreach(ICINGA2_OPENSSL_LIB crypto ssl)
list(APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/lib${ICINGA2_OPENSSL_LIB}-3${ICINGA2_OPENSSL_DLL_ARCH}.dll)
endforeach()
install( install(
PROGRAMS ${ICINGA2_OPENSSL_DLLS} PROGRAMS ${ICINGA2_OPENSSL_DLLS}
DESTINATION ${CMAKE_INSTALL_SBINDIR} DESTINATION ${CMAKE_INSTALL_SBINDIR}

4
doc/21-development.md
View File

@ -482,8 +482,8 @@ File Type: EXECUTABLE IMAGE
boost_filesystem-vc142-mt-gd-x64-1_82.dll boost_filesystem-vc142-mt-gd-x64-1_82.dll
boost_thread-vc142-mt-gd-x64-1_82.dll boost_thread-vc142-mt-gd-x64-1_82.dll
boost_regex-vc142-mt-gd-x64-1_82.dll boost_regex-vc142-mt-gd-x64-1_82.dll
libssl-1_1-x64.dll libssl-3_0-x64.dll
libcrypto-1_1-x64.dll libcrypto-3_0-x64.dll
WS2_32.dll WS2_32.dll
dbghelp.dll dbghelp.dll
SHLWAPI.dll SHLWAPI.dll

2
doc/win-dev.ps1
View File

@ -14,7 +14,7 @@ function ThrowOnNativeFailure {
$VsVersion = 2019 $VsVersion = 2019
$MsvcVersion = '14.2' $MsvcVersion = '14.2'
$BoostVersion = @(1, 82, 0) $BoostVersion = @(1, 82, 0)
$OpensslVersion = '1_1_1t' $OpensslVersion = '3_0_9'
switch ($Env:BITS) { switch ($Env:BITS) {
32 { } 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)) { if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1t-Win${env:BITS}" $env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_3_0_9-Win${env:BITS}"
} }
if (-not (Test-Path env:BOOST_ROOT)) { if (-not (Test-Path env:BOOST_ROOT)) {
$env:BOOST_ROOT = "c:\local\boost_1_82_0-Win${env:BITS}" $env:BOOST_ROOT = "c:\local\boost_1_82_0-Win${env:BITS}"