-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, 3 insertions, 1 deletions

diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index d886eeb1..99eaff65 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -26,17 +26,19 @@ else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
     pkg_check_modules(PC_LIBART libart-2.0)
 
     ######### ?? where is this used ?? ###############
-    set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS})
+    set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS_OTHER})
   ENDIF (NOT WIN32)
 
   FIND_PATH(LIBART_INCLUDE_DIR NAMES libart_lgpl/libart.h
      PATHS
+     ${PC_LIBART_INCLUDEDIR}
      ${PC_LIBART_INCLUDE_DIRS}
      PATH_SUFFIXES libart-2.0
   )
   
   FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
      PATHS
+     ${PC_LIBART_LIBDIR}
      ${PC_LIBART_LIBRARY_DIRS}
   )