CMake: set OpenSSL include dir regardless of websockets being enabled or not

pull/3/head
Christian Beier 7 years ago
parent 502e97df1a
commit 13d8a6c9c2
No known key found for this signature in database
GPG Key ID: 421BB3B45C6067F8

@ -208,7 +208,6 @@ if(WITH_WEBSOCKETS AND LIBVNCSERVER_HAVE_SYS_UIO_H)
message(STATUS "Building websockets with OpenSSL") message(STATUS "Building websockets with OpenSSL")
set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${OPENSSL_LIBRARIES}) set(WEBSOCKET_LIBRARIES ${RESOLV_LIB} ${OPENSSL_LIBRARIES})
set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl) set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl)
include_directories(${OPENSSL_INCLUDE_DIR})
else() else()
message(STATUS "Building websockets without SSL") message(STATUS "Building websockets without SSL")
set(WEBSOCKET_LIBRARIES ${RESOLV_LIB}) set(WEBSOCKET_LIBRARIES ${RESOLV_LIB})
@ -310,6 +309,7 @@ elseif(OPENSSL_FOUND)
${LIBVNCCLIENT_SOURCES} ${LIBVNCCLIENT_SOURCES}
${LIBVNCCLIENT_DIR}/tls_openssl.c ${LIBVNCCLIENT_DIR}/tls_openssl.c
) )
include_directories(${OPENSSL_INCLUDE_DIR})
else() else()
set(LIBVNCCLIENT_SOURCES set(LIBVNCCLIENT_SOURCES
${LIBVNCCLIENT_SOURCES} ${LIBVNCCLIENT_SOURCES}

Loading…
Cancel
Save