File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -517,16 +517,16 @@ if(WIN32)
517517
518518 install (FILES ${CMAKE_CURRENT_BINARY_DIR} /NSCP.msi DESTINATION ${CMAKE_INSTALL_SBINDIR} )
519519
520- if (OPENSSL_VERSION_MINOR GREATER_EQUAL 1)
521- if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64" )
522- list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR} /../bin/libcrypto-1_1-x64.dll ${OPENSSL_INCLUDE_DIR} /../bin/libssl-1_1-x64.dll)
523- else ()
524- list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR} /../bin/libcrypto-1_1.dll ${OPENSSL_INCLUDE_DIR} /../bin/libssl-1_1.dll)
525- endif ()
520+ if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64" )
521+ set (ICINGA2_OPENSSL_DLL_ARCH "-x64" )
526522 else ()
527- list ( APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR} /../bin/libeay32.dll ${OPENSSL_INCLUDE_DIR} /../bin/ssleay32.dll )
523+ set (ICINGA2_OPENSSL_DLL_ARCH "" )
528524 endif ()
529525
526+ foreach (ICINGA2_OPENSSL_LIB crypto ssl)
527+ list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR} /../bin/lib${ICINGA2_OPENSSL_LIB} -3${ICINGA2_OPENSSL_DLL_ARCH} .dll)
528+ endforeach ()
529+
530530 install (
531531 PROGRAMS ${ICINGA2_OPENSSL_DLLS}
532532 DESTINATION ${CMAKE_INSTALL_SBINDIR}
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ function ThrowOnNativeFailure {
1414$VsVersion = 2019
1515$MsvcVersion = ' 14.2'
1616$BoostVersion = @ (1 , 71 , 0 )
17- $OpensslVersion = ' 1_1_1k '
17+ $OpensslVersion = ' 3_0_15 '
1818
1919switch ($Env: BITS ) {
2020 32 { }
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
3030 }
3131}
3232if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
33- $env: OPENSSL_ROOT_DIR = " c:\local\OpenSSL_1_1_1k -Win${env: BITS} "
33+ $env: OPENSSL_ROOT_DIR = " c:\local\OpenSSL_3_0_15 -Win${env: BITS} "
3434}
3535if (-not (Test-Path env:BOOST_ROOT)) {
3636 $env: BOOST_ROOT = " c:\local\boost_1_71_0-Win${env: BITS} "
You can’t perform that action at this time.
0 commit comments