diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-11-18 21:58:50 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-11-18 21:58:50 +0000 |
| commit | 877046103ca395ba7b2d842fd00404869e54bef0 (patch) | |
| tree | 665aea0b7a5be715ff17932e65d219abd6e8035f | |
| parent | fc5cadc93a7d0191e6653fcf5bc502b7c1d22f6d (diff) | |
| download | extra-cmake-modules-877046103ca395ba7b2d842fd00404869e54bef0.tar.gz extra-cmake-modules-877046103ca395ba7b2d842fd00404869e54bef0.tar.bz2 | |
-use the prefix PC_ for the variables coming from pkgconfig
(these three modules were working correctly, this is just to establish a convention how to deal with this)
Alex
svn path=/trunk/KDE/kdelibs/; revision=886256
| -rw-r--r-- | modules/FindLibArt.cmake | 14 | ||||
| -rw-r--r-- | modules/FindLibXml2.cmake | 8 | ||||
| -rw-r--r-- | modules/FindLibXslt.cmake | 10 |
3 files changed, 16 insertions, 16 deletions
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake index 13191d23..d886eeb1 100644 --- a/modules/FindLibArt.cmake +++ b/modules/FindLibArt.cmake @@ -23,21 +23,21 @@ else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - pkg_check_modules(LIBART libart-2.0) + pkg_check_modules(PC_LIBART libart-2.0) ######### ?? where is this used ?? ############### - set(LIBART_DEFINITIONS ${LIBART_CFLAGS}) + set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS}) ENDIF (NOT WIN32) - FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h - ${LIBART_INCLUDE_DIRS}/libart-2.0 - /usr/include/libart-2.0 - /usr/local/include/libart-2.0 + FIND_PATH(LIBART_INCLUDE_DIR NAMES libart_lgpl/libart.h + PATHS + ${PC_LIBART_INCLUDE_DIRS} + PATH_SUFFIXES libart-2.0 ) FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2 PATHS - ${LIBART_LIBRARY_DIRS} + ${PC_LIBART_LIBRARY_DIRS} ) diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 8615e77b..1849e099 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -22,19 +22,19 @@ 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(LIBXML libxml-2.0) - SET(LIBXML2_DEFINITIONS ${LIBXML_CFLAGS}) + pkg_check_modules(PC_LIBXML libxml-2.0) + SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h PATHS - ${LIBXML_INCLUDE_DIRS} + ${PC_LIBXML_INCLUDE_DIRS} PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS - ${LIBXML_LIBRARY_DIRS} + ${PC_LIBXML_LIBRARY_DIRS} ) IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake index 76e8f77a..ff0110c7 100644 --- a/modules/FindLibXslt.cmake +++ b/modules/FindLibXslt.cmake @@ -22,22 +22,22 @@ 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(XSLT libxslt) - SET(LIBXSLT_DEFINITIONS ${XSLT_CFLAGS}) + pkg_check_modules(PC_XSLT libxslt) + SET(LIBXSLT_DEFINITIONS ${PC_XSLT_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h - ${XSLT_INCLUDE_DIRS} + ${PC_XSLT_INCLUDE_DIRS} ) FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt PATHS - ${XSLT_LIBRARY_DIRS} + ${PC_XSLT_LIBRARY_DIRS} ) FIND_LIBRARY(LIBEXSLT_LIBRARIES NAMES exslt libexslt PATHS - ${XSLT_LIBRARY_DIRS} + ${PC_XSLT_LIBRARY_DIRS} ) IF (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES) |