CMake: declare that websockets depend on crypto

pull/3/head
Christian Beier 7 years ago
parent 49f1d8de47
commit a2ebdf46cc
No known key found for this signature in database
GPG Key ID: 421BB3B45C6067F8

@ -218,10 +218,11 @@ if(LIBVNCSERVER_HAVE_SYS_UIO_H)
message(STATUS "Building crypto with builtin functions") message(STATUS "Building crypto with builtin functions")
set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c) set(CRYPTO_SOURCES ${COMMON_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c)
endif() endif()
set(LIBVNCSERVER_HAVE_CRYPTO 1)
endif(LIBVNCSERVER_HAVE_SYS_UIO_H) endif(LIBVNCSERVER_HAVE_SYS_UIO_H)
if(WITH_WEBSOCKETS) if(WITH_WEBSOCKETS AND LIBVNCSERVER_HAVE_CRYPTO)
set(LIBVNCSERVER_WITH_WEBSOCKETS 1) set(LIBVNCSERVER_WITH_WEBSOCKETS 1)
if(GNUTLS_FOUND) if(GNUTLS_FOUND)
message(STATUS "Building websockets with GnuTLS") message(STATUS "Building websockets with GnuTLS")
@ -237,7 +238,7 @@ if(WITH_WEBSOCKETS)
set(WEBSOCKET_LIBRARIES) set(WEBSOCKET_LIBRARIES)
set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c) set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c)
endif() endif()
endif(WITH_WEBSOCKETS) endif(WITH_WEBSOCKETS AND LIBVNCSERVER_HAVE_CRYPTO)
if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES) if(WITH_GCRYPT AND LIBGCRYPT_LIBRARIES)
message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}") message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}")

Loading…
Cancel
Save