diff options
| author | Christian Beier <dontmind@freeshell.org> | 2017-04-21 14:35:35 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2017-04-21 14:35:35 +0200 |
| commit | 5e6a0daed54eaaff4dbf912dad180cac0ab492b2 (patch) | |
| tree | 2f1c6cb51dbb3cc9bd1e63fafec6b9135b64a558 /CMakeLists.txt | |
| parent | fc2899af7a3b402d5c689b0cc8527f965875b9e0 (diff) | |
| parent | 7ccae55b59d11378b203015d8d2dd33314f22a28 (diff) | |
| download | libtdevnc-5e6a0daed54eaaff4dbf912dad180cac0ab492b2.tar.gz libtdevnc-5e6a0daed54eaaff4dbf912dad180cac0ab492b2.zip | |
Merge branch 'tmcqueengit push origin master-materials-patch-1'
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a218222..3263f34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ set(LIBVNCSRVEXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples) set(LIBVNCCLIEXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/client_examples) set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libvncserver ${CMAKE_CURRENT_SOURCE_DIR}/common) @@ -41,6 +42,7 @@ option(WITH_GNUTLS "Search for the GnuTLS secure communications library to suppo option(WITH_OPENSSL "Search for the OpenSSL cryptography library to support encryption" ON) option(WITH_SYSTEMD "Search for libsystemd to build with systemd socket activation support" ON) option(WITH_GCRYPT "Search for libgcrypt to support additional authentication methods in LibVNCClient" ON) +option(WITH_FFMPEG "Search for FFMPEG to build an example VNC to MPEG encoder" ON) option(WITH_TIGHTVNC_FILETRANSFER "Enable filetransfer if there is pthreads support" ON) option(WITH_24BPP "Allow 24 bpp" ON) option(WITH_IPv6 "Enable IPv6 Support" ON) @@ -126,6 +128,10 @@ if(WITH_GCRYPT) find_library(LIBGCRYPT_LIBRARIES gcrypt) endif(WITH_GCRYPT) +if(WITH_FFMPEG) + find_package(FFMPEG) +endif(WITH_FFMPEG) + check_include_file("endian.h" LIBVNCSERVER_HAVE_ENDIAN_H) check_include_file("fcntl.h" LIBVNCSERVER_HAVE_FCNTL_H) @@ -457,12 +463,12 @@ if(SDL_FOUND) set(SDLvncviewer_EXTRA_SOURCES scrap.c) endif(SDL_FOUND) -if(HAVE_FFMPEG) +if(FFMPEG_FOUND) set(LIBVNCCLIENT_EXAMPLES ${LIBVNCCLIENT_EXAMPLES} vnc2mpg ) -endif(HAVE_FFMPEG) +endif(FFMPEG_FOUND) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/examples) |