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

Fix CMake handling of openssl 1.1.0 

fixes #5141
This commit is contained in:
Jean Flach 2017-04-05 17:51:20 +02:00
parent 1459970986
commit 966c2a4602
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -335,11 +335,20 @@ if(WIN32)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi DESTINATION ${CMAKE_INSTALL_SBINDIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi 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
DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
else()
install( install(
PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
${OPENSSL_INCLUDE_DIR}/../bin/libeay32.dll ${OPENSSL_INCLUDE_DIR}/../bin/ssleay32.dll ${OPENSSL_INCLUDE_DIR}/../bin/libeay32.dll ${OPENSSL_INCLUDE_DIR}/../bin/ssleay32.dll
DESTINATION ${CMAKE_INSTALL_SBINDIR} DESTINATION ${CMAKE_INSTALL_SBINDIR}
) )
endif()
endif() endif()
include(CPack) include(CPack)