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

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
This commit is contained in:
Alexander Neundorf 2009-11-22 05:51:38 -05:00
parent 2d9c72c7e5
commit a10198c54e
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/FindLibXml2.cmake
View File

@ -1,4 +1,4 @@
# - Try to find LibXml2 # - Try to find the LibXml2 xml processing library
# Once done this will define # Once done this will define
# #
# LIBXML2_FOUND - System has LibXml2 # LIBXML2_FOUND - System has LibXml2
@ -21,20 +21,13 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) # use pkg-config to get the directories and then use these values
# in cache already # in the FIND_PATH() and FIND_LIBRARY() calls
SET(LibXml2_FIND_QUIETLY TRUE) FIND_PACKAGE(PkgConfig)
ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
IF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR NAMES libxml/xpath.h
# 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 HINTS
${PC_LIBXML_INCLUDEDIR} ${PC_LIBXML_INCLUDEDIR}
${PC_LIBXML_INCLUDE_DIRS} ${PC_LIBXML_INCLUDE_DIRS}

29
Modules/FindLibXslt.cmake
View File

@ -1,4 +1,4 @@
# - Try to find LibXslt # - Try to find the LibXslt library
# Once done this will define # Once done this will define
# #
# LIBXSLT_FOUND - system has LibXslt # LIBXSLT_FOUND - system has LibXslt
@ -20,26 +20,23 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) # use pkg-config to get the directories and then use these values
# in cache already # in the FIND_PATH() and FIND_LIBRARY() calls
SET(LibXslt_FIND_QUIETLY TRUE) FIND_PACKAGE(PkgConfig)
ENDIF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) PKG_CHECK_MODULES(PC_LIBXSLT libxslt)
SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER})
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 FIND_PATH(LIBXSLT_INCLUDE_DIR NAMES libxslt/xslt.h
${_LibXsltIncDir} HINTS
${PC_LIBXSLT_INCLUDEDIR}
${PC_LIBXSLT_INCLUDE_DIRS}
) )
FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
PATHS HINTS
${_LibXsltLinkDir} ${PC_LIBXSLT_LIBDIR}
${PC_LIBXSLT_LIBRARY_DIRS}
) )
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)