[Cmake-commits] CMake branch, master, updated. v2.8.7-194-g8372bd9

David Cole david.cole at kitware.com
Wed Jan 25 11:18:31 EST 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  8372bd98a9d5df29a483e8b43266ed928cba9ebe (commit)
       via  b5719fb7272707889030f990d8c6bf66f415c417 (commit)
      from  825b9dde3d391169ad0546b4458f1d3e1bc88756 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8372bd98a9d5df29a483e8b43266ed928cba9ebe
commit 8372bd98a9d5df29a483e8b43266ed928cba9ebe
Merge: 825b9dd b5719fb
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Jan 25 11:18:29 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 11:18:29 2012 -0500

    Merge topic 'improve-findgnutls'
    
    b5719fb FindGnuTLS: partly support version selection

diff --cc Modules/FindGnuTLS.cmake
index e69a16b,2e2bf8a..02f2964
--- a/Modules/FindGnuTLS.cmake
+++ b/Modules/FindGnuTLS.cmake
@@@ -35,9 -35,10 +35,10 @@@ IF (NOT WIN32
     # try using pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
     # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful
 -   FIND_PACKAGE(PkgConfig)
 -   PKG_CHECK_MODULES(PC_GNUTLS gnutls)
 +   FIND_PACKAGE(PkgConfig QUIET)
 +   PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls)
     SET(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER})
+    SET(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION})
  ENDIF (NOT WIN32)
  
  FIND_PATH(GNUTLS_INCLUDE_DIR gnutls/gnutls.h

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGnuTLS.cmake |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list