[Cmake-commits] [cmake-commits] alex committed FindLibXml2.cmake 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv28707

Modified Files:
	FindLibXml2.cmake 
Log Message:
BUG: use FindPkgConfig.cmake instead of UsePkgConfig.cmake, sync with KDE
svn and fix bug #8290

Alex


Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** FindLibXml2.cmake	16 Aug 2008 11:22:59 -0000	1.5
--- FindLibXml2.cmake	22 Dec 2008 08:00:08 -0000	1.6
***************
*** 22,39 ****
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
!    INCLUDE(UsePkgConfig)
!    PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
!    SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
  ENDIF (NOT WIN32)
  
  FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
!    PATHS
!    ${_LibXml2IncDir}
     PATH_SUFFIXES libxml2
     )
  
  FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
!    PATHS
!    ${_LibXml2LinkDir}
     )
  
--- 22,41 ----
     # 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)
!    SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
  ENDIF (NOT WIN32)
  
  FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
!    HINTS
!    ${PC_LIBXML_INCLUDEDIR}
!    ${PC_LIBXML_INCLUDE_DIRS}
     PATH_SUFFIXES libxml2
     )
  
  FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
!    HINTS
!    ${PC_LIBXML_LIBDIR}
!    ${PC_LIBXML_LIBRARY_DIRS}
     )