浏览代码

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.
Rolf Eike Beer 14 年之前
父节点
当前提交
ede3ec5a79
共有 4 个文件被更改,包括 7 次插入9 次删除
  1. 2 2
      Modules/FindGnuTLS.cmake
  2. 2 2
      Modules/FindLibXml2.cmake
  3. 1 1
      Modules/FindLibXslt.cmake
  4. 2 4
      Modules/FindOpenSSL.cmake

+ 2 - 2
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)
 

+ 2 - 2
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

+ 1 - 1
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})
 

+ 2 - 4
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