diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-01-25 17:32:24 +0100 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2011-01-25 17:36:00 +0100 |
| commit | ffe30366d63fd318f0ee3b55dd9a60642bfb5d88 (patch) | |
| tree | 62a6b6b3c6157794619b63a81d4f8fcc7c45e6b0 /CMakeLists.txt | |
| parent | 5e1488beb3903b2d3fa2fd2457f8bff781033d9a (diff) | |
| download | libvncserver-ffe30366d63fd318f0ee3b55dd9a60642bfb5d88.zip libvncserver-ffe30366d63fd318f0ee3b55dd9a60642bfb5d88.tar.gz | |
Put files used by both libs into a 'common' dir.
No functional changes. All files used by _both_ libvncserver and
libvncclient are put into a 'common' directory and references
from other files as well as Autotools and CMake build systems are
updated.
Signed-off-by: Christian Beier <dontmind@freeshell.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e0337b..57653b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(FULL_PACKAGE_NAME "LibVNCServer") set(PACKAGE_VERSION "0.9.7") set(PROJECT_BUGREPORT_PATH "http://sourceforge.net/projects/libvncserver") -include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/libvncserver) +include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/libvncserver ${CMAKE_SOURCE_DIR}/common) find_package(ZLIB) find_package(JPEG) @@ -80,6 +80,7 @@ configure_file(${CMAKE_SOURCE_DIR}/rfb/rfbconfig.h.cmake ${CMAKE_BINARY_DIR}/rfb 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) @@ -101,10 +102,10 @@ set(LIBVNCSERVER_SOURCES ${LIBVNCSERVER_DIR}/font.c ${LIBVNCSERVER_DIR}/draw.c ${LIBVNCSERVER_DIR}/selbox.c - ${LIBVNCSERVER_DIR}/d3des.c - ${LIBVNCSERVER_DIR}/vncauth.c + ${COMMON_DIR}/d3des.c + ${COMMON_DIR}/vncauth.c ${LIBVNCSERVER_DIR}/cargs.c - ${LIBVNCSERVER_DIR}/minilzo.c + ${COMMON_DIR}/minilzo.c ${LIBVNCSERVER_DIR}/ultra.c ${LIBVNCSERVER_DIR}/scale.c ) @@ -115,7 +116,7 @@ set(LIBVNCCLIENT_SOURCES ${LIBVNCCLIENT_DIR}/rfbproto.c ${LIBVNCCLIENT_DIR}/sockets.c ${LIBVNCCLIENT_DIR}/vncviewer.c - ${LIBVNCCLIENT_DIR}/minilzo.c + ${COMMON_DIR}/minilzo.c ${LIBVNCCLIENT_DIR}/tls.c ) |
