diff options
| author | Gernot Tenchio <gernot.tenchio@securepoint.de> | 2012-01-12 10:01:41 +0100 |
|---|---|---|
| committer | Gernot Tenchio <gernot.tenchio@securepoint.de> | 2012-01-12 10:01:41 +0100 |
| commit | 9e09040699f7c0804507e426fb7c3f741ab9064c (patch) | |
| tree | ea26321e990bedc6e47ebd9fd57edc5f4e105358 /CMakeLists.txt | |
| parent | 78bd41ad5e7629e92dffdbe8ac98b3bae104f645 (diff) | |
| download | libtdevnc-9e09040699f7c0804507e426fb7c3f741ab9064c.tar.gz libtdevnc-9e09040699f7c0804507e426fb7c3f741ab9064c.zip | |
cmake: adapted to latest websocket crypto changes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba3ff43..4990309 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,12 @@ set(FULL_PACKAGE_NAME "LibVNCServer") set(PACKAGE_VERSION "0.9.8") set(PROJECT_BUGREPORT_PATH "http://sourceforge.net/projects/libvncserver") set(CMAKE_C_FLAGS "-O2 -W -Wall -g") +set(LIBVNCSERVER_DIR ${CMAKE_SOURCE_DIR}/libvncserver) +set(COMMON_DIR ${CMAKE_SOURCE_DIR}/common) +set(LIBVNCCLIENT_DIR ${CMAKE_SOURCE_DIR}/libvncclient) +set(LIBVNCSRVTEST_DIR ${CMAKE_SOURCE_DIR}/examples) +set(LIBVNCCLITEST_DIR ${CMAKE_SOURCE_DIR}/client_examples) + include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/libvncserver ${CMAKE_SOURCE_DIR}/common) @@ -47,11 +53,15 @@ if(GNUTLS_FOUND) set(LIBVNCSERVER_WITH_CLIENT_TLS 1) option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (gnutls)" ON) set(WEBSOCKET_LIBRARIES -lresolv ${GNUTLS_LIBRARIES}) - set(WSSRCS rfbssl_gnutls) + set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_gnutls ${LIBVNCSERVER_DIR}/rfbcrypto_gnutls) elseif(OPENSSL_FOUND) option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (openssl)" ON) set(WEBSOCKET_LIBRARIES -lresolv ${OPENSSL_LIBRARIES}) - set(WSSRCS rfbssl_openssl) + set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_openssl ${LIBVNCSERVER_DIR}/rfbcrypto_openssl) +else() + option(LIBVNCSERVER_WITH_WEBSOCKETS "Build with websockets support (no ssl)" ON) + set(WEBSOCKET_LIBRARIES -lresolv) + set(WSSRCS ${LIBVNCSERVER_DIR}/rfbssl_none.c ${LIBVNCSERVER_DIR}/rfbcrypto_included.c ${COMMON_DIR}/md5.c ${COMMON_DIR}/sha1.c) endif() if(LIBGCRYPT_LIBRARIES) @@ -106,12 +116,6 @@ TEST_BIG_ENDIAN(LIBVNCSERVER_WORDS_BIGENDIAN) configure_file(${CMAKE_SOURCE_DIR}/rfb/rfbconfig.h.cmake ${CMAKE_BINARY_DIR}/rfb/rfbconfig.h) configure_file(${CMAKE_SOURCE_DIR}/rfb/rfbint.h.cmake ${CMAKE_BINARY_DIR}/rfb/rfbint.h) -set(LIBVNCSERVER_DIR ${CMAKE_SOURCE_DIR}/libvncserver) -set(COMMON_DIR ${CMAKE_SOURCE_DIR}/common) -set(LIBVNCCLIENT_DIR ${CMAKE_SOURCE_DIR}/libvncclient) -set(LIBVNCSRVTEST_DIR ${CMAKE_SOURCE_DIR}/examples) -set(LIBVNCCLITEST_DIR ${CMAKE_SOURCE_DIR}/client_examples) - set(LIBVNCSERVER_SOURCES ${LIBVNCSERVER_DIR}/main.c ${LIBVNCSERVER_DIR}/rfbserver.c @@ -191,9 +195,7 @@ if(LIBVNCSERVER_WITH_WEBSOCKETS) set(LIBVNCSERVER_SOURCES ${LIBVNCSERVER_SOURCES} ${LIBVNCSERVER_DIR}/websockets.c - ${LIBVNCSERVER_DIR}/${WSSRCS} - ${COMMON_DIR}/md5.c - ${COMMON_DIR}/sha1.c + ${WSSRCS} ) endif(LIBVNCSERVER_WITH_WEBSOCKETS) |