From: Jean Flach Date: Thu, 6 Apr 2017 10:58:05 +0000 (+0200) Subject: Fix openssl1.1 for x64 builds X-Git-Tag: v2.7.0~141 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c86094c8266d0498161965972c94c8edcb4ae584;p=icinga2 Fix openssl1.1 for x64 builds refs #4822 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 3839e5e9c..5c252f596 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,10 +335,27 @@ if(WIN32) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi DESTINATION ${CMAKE_INSTALL_SBINDIR}) + if (OPENSSL_VERSION_MINOR GREATER_EQUAL 1) + if (CMAKE_VS_PLATFORM_NAME STREQUAL "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() + list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libeay32.dll ${OPENSSL_INCLUDE_DIR}/../bin/ssleay32.dll) + endif() + + message (INFO "Using " ${ICINGA2_OPENSSL_DLLS}) + install( + PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} + ${ICINGA2_OPENSSL_DLLS} + DESTINATION ${CMAKE_INSTALL_SBINDIR} + ) + if (OPENSSL_VERSION_MINOR GREATER_EQUAL 1) install( PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} - ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1.dll + ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1-x64.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1-x64.dll DESTINATION ${CMAKE_INSTALL_SBINDIR} ) else()