[Cmake-commits] CMake branch, next, updated. v2.8.7-2200-g6d403e1

[Rolf Eike Beer]

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, next has been updated
       via  6d403e168707cbdbf81bcb503de07a0a56770ea3 (commit)
       via  b5719fb7272707889030f990d8c6bf66f415c417 (commit)
      from  30c4f7ebf72275894417ec55b5296b701014d6ce (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=6d403e168707cbdbf81bcb503de07a0a56770ea3
commit 6d403e168707cbdbf81bcb503de07a0a56770ea3
Merge: 30c4f7e b5719fb
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 23 14:08:59 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 23 14:08:59 2012 -0500

    Merge topic 'improve-findgnutls' into next
    
    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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5719fb7272707889030f990d8c6bf66f415c417
commit b5719fb7272707889030f990d8c6bf66f415c417
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 23 19:19:10 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 23 20:07:46 2012 +0100

    FindGnuTLS: partly support version selection
    
    For the Un*x systems where we use PkgConfig to find the library we can also
    use the version returned from there.

diff --git a/Modules/FindGnuTLS.cmake b/Modules/FindGnuTLS.cmake
index a437a1f..2e2bf8a 100644
--- a/Modules/FindGnuTLS.cmake
+++ b/Modules/FindGnuTLS.cmake
@@ -38,6 +38,7 @@ IF (NOT WIN32)
    FIND_PACKAGE(PkgConfig)
    PKG_CHECK_MODULES(PC_GNUTLS 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
@@ -57,7 +58,9 @@ MARK_AS_ADVANCED(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY)
 # handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS
+                                  REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR
+                                  VERSION_VAR GNUTLS_VERSION_STRING)
 
 IF(GNUTLS_FOUND)
     SET(GNUTLS_LIBRARIES    ${GNUTLS_LIBRARY})

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

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


hooks/post-receive
-- 
CMake