diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-10-17 10:36:58 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-10-17 10:36:58 +0200 |
| commit | ec3dfe68934d4bacc5604ae7b601ab72e1fccc2f (patch) | |
| tree | 21d75674eeb84a3a66c18471ec66895b19060a77 /CMakeLists.txt | |
| parent | 705276743c0dcf15c17c8b56794855cebdecfc1b (diff) | |
| download | tigervnc-ec3dfe68934d4bacc5604ae7b601ab72e1fccc2f.tar.gz tigervnc-ec3dfe68934d4bacc5604ae7b601ab72e1fccc2f.zip | |
Clean up GnuTLS linking and instructions
GnuTLS can have different crypto backends, and it is rarely gcrypt
these days. So we should not be including that unconditionally,
and should not be pointing people at it either. Also remove the
section about Win32 binaries as those are out of date and probably
insecure. Lastly remove the section about static builds as it is
a general issue and in no way complete with just the GnuTLS portions.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 24e923e3..5e600a26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,20 +310,8 @@ endif() option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON) if(ENABLE_GNUTLS) find_package(GnuTLS) - find_package(Gcrypt) - find_package(Gpg_Error) if (GNUTLS_FOUND) include_directories(${GNUTLS_INCLUDE_DIR}) - if (GCRYPT_FOUND) - include_directories(${GCRYPT_INCLUDE_DIR}) - set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARIES};${GCRYPT_LIBRARIES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GCRYPT_LIBRARIES}) - if (GPG_ERROR_FOUND) - include_directories(${GPG_ERROR_INCLUDE_DIR}) - set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARIES};${GPG_ERROR_LIBRARIES}) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GPG_ERROR_LIBRARIES}) - endif() - endif() add_definitions("-DHAVE_GNUTLS") add_definitions(${GNUTLS_DEFINITIONS}) @@ -332,7 +320,6 @@ if(ENABLE_GNUTLS) set(CMAKE_EXTRA_INCLUDE_FILES gnutls/gnutls.h) set(CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES}) if(WIN32) - set(CMAKE_EXTRA_INCLUDE_FILES gcrypt.h ${CMAKE_EXTRA_INCLUDE_FILES}) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ws2_32 user32) endif() if(ZLIB_FOUND) |