Revision: 5169
http://sourceforge.net/p/tigervnc/code/5169
Author: ossman_
Date: 2014-03-19 13:22:01 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
Backport r5160 from trunk.
Revision Links:
--------------
http://sourceforge.net/p/tigervnc/code/5160
Modified Paths:
--------------
branches/1_3/CMakeLists.txt
Added Paths:
-----------
branches/1_3/cmake/Modules/FindGcrypt.cmake
branches/1_3/cmake/Modules/FindGpg_Error.cmake
Modified: branches/1_3/CMakeLists.txt
===================================================================
--- branches/1_3/CMakeLists.txt 2014-03-19 12:43:51 UTC (rev 5168)
+++ branches/1_3/CMakeLists.txt 2014-03-19 13:22:01 UTC (rev 5169)
@@ -307,8 +307,20 @@
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})
Added: branches/1_3/cmake/Modules/FindGcrypt.cmake
===================================================================
--- branches/1_3/cmake/Modules/FindGcrypt.cmake (rev 0)
+++ branches/1_3/cmake/Modules/FindGcrypt.cmake 2014-03-19 13:22:01 UTC (rev
5169)
@@ -0,0 +1,36 @@
+# - Find gcrypt
+# Find the native GCRYPT includes and library
+#
+# GCRYPT_FOUND - True if gcrypt found.
+# GCRYPT_INCLUDE_DIR - where to find gcrypt.h, etc.
+# GCRYPT_LIBRARIES - List of libraries when using gcrypt.
+
+if (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES)
+ set(GCRYPT_FIND_QUIETLY TRUE)
+endif (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES)
+
+# Include dir
+find_path(GCRYPT_INCLUDE_DIR
+ NAMES
+ gcrypt.h
+)
+
+# Library
+find_library(GCRYPT_LIBRARY
+ NAMES gcrypt
+)
+
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY
GCRYPT_INCLUDE_DIR)
+
+IF(GCRYPT_FOUND)
+ SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} )
+ELSE(GCRYPT_FOUND)
+ SET( GCRYPT_LIBRARIES )
+ENDIF(GCRYPT_FOUND)
+
+# Lastly make it so that the GCRYPT_LIBRARY and GCRYPT_INCLUDE_DIR variables
+# only show up under the advanced options in the gui cmake applications.
+MARK_AS_ADVANCED( GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR )
Added: branches/1_3/cmake/Modules/FindGpg_Error.cmake
===================================================================
--- branches/1_3/cmake/Modules/FindGpg_Error.cmake
(rev 0)
+++ branches/1_3/cmake/Modules/FindGpg_Error.cmake 2014-03-19 13:22:01 UTC
(rev 5169)
@@ -0,0 +1,36 @@
+# - Find gpg-error
+# Find the native GPG_ERROR includes and library
+#
+# GPG_ERROR_FOUND - True if gpg-error found.
+# GPG_ERROR_INCLUDE_DIR - where to find gpg-error.h, etc.
+# GPG_ERROR_LIBRARIES - List of libraries when using gpg-error.
+
+if (GPG_ERROR_INCLUDE_DIR AND GPG_ERROR_LIBRARIES)
+ set(GPG_ERROR_FIND_QUIETLY TRUE)
+endif (GPG_ERROR_INCLUDE_DIR AND GPG_ERROR_LIBRARIES)
+
+# Include dir
+find_path(GPG_ERROR_INCLUDE_DIR
+ NAMES
+ gpg-error.h
+)
+
+# Library
+find_library(GPG_ERROR_LIBRARY
+ NAMES gpg-error
+)
+
+# handle the QUIETLY and REQUIRED arguments and set GPG_ERROR_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPG_ERROR DEFAULT_MSG GPG_ERROR_LIBRARY
GPG_ERROR_INCLUDE_DIR)
+
+IF(GPG_ERROR_FOUND)
+ SET( GPG_ERROR_LIBRARIES ${GPG_ERROR_LIBRARY} )
+ELSE(GPG_ERROR_FOUND)
+ SET( GPG_ERROR_LIBRARIES )
+ENDIF(GPG_ERROR_FOUND)
+
+# Lastly make it so that the GPG_ERROR_LIBRARY and GPG_ERROR_INCLUDE_DIR
variables
+# only show up under the advanced options in the gui cmake applications.
+MARK_AS_ADVANCED( GPG_ERROR_LIBRARY GPG_ERROR_INCLUDE_DIR )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
