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

BUG: use FindPkgConfig.cmake instead of UsePkgConfig.cmake, sync with KDE 

svn and fix bug #8290

Alex
This commit is contained in:
Alexander Neundorf 2008-12-22 03:00:08 -05:00
parent baf324abd8
commit 903b0a8150
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/FindLibXml2.cmake
View File

@ -21,20 +21,22 @@ ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
IF (NOT WIN32) IF (NOT WIN32)
# 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
INCLUDE(UsePkgConfig) FIND_PACKAGE(PkgConfig)
PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
ENDIF (NOT WIN32) ENDIF (NOT WIN32)
FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
PATHS HINTS
${_LibXml2IncDir} ${PC_LIBXML_INCLUDEDIR}
${PC_LIBXML_INCLUDE_DIRS}
PATH_SUFFIXES libxml2 PATH_SUFFIXES libxml2
) )
FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
PATHS HINTS
${_LibXml2LinkDir} ${PC_LIBXML_LIBDIR}
${PC_LIBXML_LIBRARY_DIRS}
) )
FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint) FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint)