kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Rolf Eike Beer 2012-01-23 19:03:54 +01:00
parent 86c9604f98
commit ede3ec5a79
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindGnuTLS.cmake
View File

@ -35,8 +35,8 @@ IF (NOT WIN32)
# try using pkg-config to get the directories and then use these values # try using pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls # in the FIND_PATH() and FIND_LIBRARY() calls
# also fills in GNUTLS_DEFINITIONS, although that isn't normally useful # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful
FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PkgConfig QUIET)
PKG_CHECK_MODULES(PC_GNUTLS gnutls) PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls)
SET(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) SET(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER})
ENDIF (NOT WIN32) ENDIF (NOT WIN32)

4
Modules/FindLibXml2.cmake
View File

@ -23,8 +23,8 @@
# use pkg-config to get the directories and then use these values # use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls # in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PkgConfig QUIET)
PKG_CHECK_MODULES(PC_LIBXML libxml-2.0 QUIET) PKG_CHECK_MODULES(PC_LIBXML QUIET libxml-2.0)
SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER}) SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h

2
Modules/FindLibXslt.cmake
View File

@ -25,7 +25,7 @@
# use pkg-config to get the directories and then use these values # use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls # in the FIND_PATH() and FIND_LIBRARY() calls
FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PkgConfig QUIET)
PKG_CHECK_MODULES(PC_LIBXSLT QUIET libxslt) PKG_CHECK_MODULES(PC_LIBXSLT QUIET libxslt)
SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER}) SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER})

6
Modules/FindOpenSSL.cmake
View File

@ -25,10 +25,8 @@
# License text for the above reference.) # License text for the above reference.)
if (UNIX) if (UNIX)
find_package(PkgConfig) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND) pkg_check_modules(_OPENSSL QUIET openssl)
pkg_check_modules(_OPENSSL openssl)
endif (PKG_CONFIG_FOUND)
endif (UNIX) endif (UNIX)
# http://www.slproweb.com/products/Win32OpenSSL.html # http://www.slproweb.com/products/Win32OpenSSL.html