-rework all uses of find_package(PkgConfig)/pkg_check_modules():

the prefix used for pkgconfig config (e.g. SQLITE) now *always* gets an additional "PC_" prefix, so the prefix used
for pkgconfig is now "PC_SQLITE_". This avoids name clashes between variables defined by the pkgconfig macro and the find module
and unwanted effects.

*Never* use the _CFLAGS coming from pkgconfig, but always CFLAGS_OTHER, since these shouldn't contain the include directories.
If the include directories would be in the DEFINITIONS variable this could clash with the results of find_path() for finding include dirs.

*Always* use both foo_INCLUDEDIR, foo_INCLUDE_DIRS for searching the include dir, and also both foo_LIBDIR and foo_LIBRARY_DIRS for
searching the libraries.

These directories coming from pkgconfig are *never* used exclusively, but *always* additionally to the standard search dirs,
either before them (then using the "HINTS" keyword) or after them (then using the "PATHS" keyword)

I hope I didn't break (too much) stuff. At least on my system it all seems to work the same way as it did before, with and without pkgconfig.

Alex





svn path=/trunk/KDE/kdelibs/; revision=891805

1 files changed, 5 insertions, 1 deletions

diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index ff0110c7..3a1bcd46 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -23,20 +23,24 @@ IF (NOT WIN32)
    # in the FIND_PATH() and FIND_LIBRARY() calls
    find_package(PkgConfig)
    pkg_check_modules(PC_XSLT libxslt)
-   SET(LIBXSLT_DEFINITIONS ${PC_XSLT_CFLAGS})
+   SET(LIBXSLT_DEFINITIONS ${PC_XSLT_CFLAGS_OTHER})
 ENDIF (NOT WIN32)
 
 FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
+    PATHS
+    ${PC_XSLT_INCLUDEDIR}
     ${PC_XSLT_INCLUDE_DIRS}
   )
 
 FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
     PATHS
+    ${PC_XSLT_LIBDIR}
     ${PC_XSLT_LIBRARY_DIRS}
   )
 
 FIND_LIBRARY(LIBEXSLT_LIBRARIES NAMES exslt libexslt
     PATHS
+    ${PC_XSLT_LIBDIR}
     ${PC_XSLT_LIBRARY_DIRS}
   )