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

[cmake-commits at cmake.org]

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

Modified Files:
	FindLibXml2.cmake FindLibXslt.cmake 
Log Message:
don't use deprecated UsePkgConfig.cmake file in FindLibXslt.cmake, some cosmetics

-use find_package(PkgConfig) instead of include(UsePkgConfig)
-remove the "if already cached make silent" logic, this is already handled by find_package_handle_standard_args()
-remove the if(WIN32) around pkg-config, it shouldn't be necessary

Alex


Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** FindLibXml2.cmake	28 Sep 2009 15:45:36 -0000	1.7
--- FindLibXml2.cmake	22 Nov 2009 10:51:38 -0000	1.8
***************
*** 1,3 ****
! # - Try to find LibXml2
  # Once done this will define
  #
--- 1,3 ----
! # - Try to find the LibXml2 xml processing library
  # Once done this will define
  #
***************
*** 22,39 ****
  #  License text for the above reference.)
  
! IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
!    # in cache already
!    SET(LibXml2_FIND_QUIETLY TRUE)
! ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
! 
! IF (NOT WIN32)
!    # 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}
--- 22,32 ----
  #  License text for the above reference.)
  
! # 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})
  
! FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
     HINTS
     ${PC_LIBXML_INCLUDEDIR}

Index: FindLibXslt.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXslt.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** FindLibXslt.cmake	28 Sep 2009 15:45:37 -0000	1.4
--- FindLibXslt.cmake	22 Nov 2009 10:51:38 -0000	1.5
***************
*** 1,3 ****
! # - Try to find LibXslt
  # Once done this will define
  #
--- 1,3 ----
! # - Try to find the LibXslt library
  # Once done this will define
  #
***************
*** 21,44 ****
  #  License text for the above reference.)
  
! IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
!    # in cache already
!    SET(LibXslt_FIND_QUIETLY TRUE)
! ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
  
- IF (NOT WIN32)
-    # use pkg-config to get the directories and then use these values
-    # in the FIND_PATH() and FIND_LIBRARY() calls
-    INCLUDE(UsePkgConfig)
-    PKGCONFIG(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags)
-    SET(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
- ENDIF (NOT WIN32)
  
! FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
!     ${_LibXsltIncDir}
    )
  
  FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
!     PATHS
!     ${_LibXsltLinkDir}
    )
  
--- 21,41 ----
  #  License text for the above reference.)
  
! # 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_LIBXSLT libxslt)
! SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER})
  
  
! FIND_PATH(LIBXSLT_INCLUDE_DIR NAMES libxslt/xslt.h
!     HINTS 
!    ${PC_LIBXSLT_INCLUDEDIR}
!    ${PC_LIBXSLT_INCLUDE_DIRS}
    )
  
  FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
!     HINTS
!    ${PC_LIBXSLT_LIBDIR}
!    ${PC_LIBXSLT_LIBRARY_DIRS}
    )