[Cmake-commits] CMake branch, next, updated. v2.8.7-2196-gc63a1a9

Rolf Eike Beer eike at sf-mail.de
Mon Jan 23 14:05:22 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, next has been updated
       via  c63a1a9c5756b3a80ee1d94c0108165151dd2d67 (commit)
       via  ede3ec5a799768482a7bc37ac44da99817b62316 (commit)
       via  86c9604f98b2271401cf7a53c251be51af15278c (commit)
      from  5b6fde5eadf79d179d592ff977cd081db64f9ecc (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=c63a1a9c5756b3a80ee1d94c0108165151dd2d67
commit c63a1a9c5756b3a80ee1d94c0108165151dd2d67
Merge: 5b6fde5 ede3ec5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 23 14:05:08 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 23 14:05:08 2012 -0500

    Merge topic 'use-pkgconfig-quiet' into next
    
    ede3ec5 use pkg_check_modules() quiet in other modules
    86c9604 KWSys Nightly Date Stamp


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

    use pkg_check_modules() quiet in other modules
    
    Those modules will already print what they found or not using FPHSA, no need
    to do this twice.

diff --git a/Modules/FindGnuTLS.cmake b/Modules/FindGnuTLS.cmake
index a437a1f..e69a16b 100644
--- a/Modules/FindGnuTLS.cmake
+++ b/Modules/FindGnuTLS.cmake
@@ -35,8 +35,8 @@ 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})
 ENDIF (NOT WIN32)
 
diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake
index 95ae180..396d810 100644
--- a/Modules/FindLibXml2.cmake
+++ b/Modules/FindLibXml2.cmake
@@ -23,8 +23,8 @@
 
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
-FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_LIBXML libxml-2.0 QUIET)
+FIND_PACKAGE(PkgConfig QUIET)
+PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0)
 SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
 
 FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
diff --git a/Modules/FindLibXslt.cmake b/Modules/FindLibXslt.cmake
index 1f49c3b..1e42f42 100644
--- a/Modules/FindLibXslt.cmake
+++ b/Modules/FindLibXslt.cmake
@@ -25,7 +25,7 @@
 
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
-FIND_PACKAGE(PkgConfig)
+FIND_PACKAGE(PkgConfig QUIET)
 PKG_CHECK_MODULES(PC_LIBXSLT QUIET libxslt)
 SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER})
 
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index af799d6..bd71d24 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -25,10 +25,8 @@
 #  License text for the above reference.)
 
 if (UNIX)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(_OPENSSL openssl)
-  endif (PKG_CONFIG_FOUND)
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(_OPENSSL QUIET openssl)
 endif (UNIX)
 
 # http://www.slproweb.com/products/Win32OpenSSL.html

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

Summary of changes:
 Modules/FindGnuTLS.cmake          |    4 ++--
 Modules/FindLibXml2.cmake         |    4 ++--
 Modules/FindLibXslt.cmake         |    2 +-
 Modules/FindOpenSSL.cmake         |    6 ++----
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list