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

[cmake-commits at cmake.org]

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

Modified Files:
	FindLibXml2.cmake 
Log Message:
ENH: also search for xmllint, which comes with libxml2 (sync with FindLibXml2.cmake from KDE)

Alex


Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** FindLibXml2.cmake	23 Jul 2007 13:49:52 -0000	1.4
--- FindLibXml2.cmake	16 Aug 2008 11:22:59 -0000	1.5
***************
*** 2,9 ****
  # Once done this will define
  #
! #  LIBXML2_FOUND - system has LibXml2
! #  LIBXML2_INCLUDE_DIR - the LibXml2 include directory
! #  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
  #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
  
  # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
--- 2,10 ----
  # Once done this will define
  #
! #  LIBXML2_FOUND - System has LibXml2
! #  LIBXML2_INCLUDE_DIR - The LibXml2 include directory
! #  LIBXML2_LIBRARIES - The libraries needed to use LibXml2
  #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
+ #  LIBXML2_XMLLINT_EXECUTABLE - The XML checking tool xmllint coming with LibXml2
  
  # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
***************
*** 37,40 ****
--- 38,45 ----
     )
  
+ FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint)
+ # for backwards compat. with KDE 4.0.x:
+ SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}")
+ 
  INCLUDE(FindPackageHandleStandardArgs)
  
***************
*** 43,46 ****
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
  
! MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
  
--- 48,51 ----
  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
  
! MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE)