-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, 6 insertions, 4 deletions

diff --git a/modules/FindBlueZ.cmake b/modules/FindBlueZ.cmake
index 8e1a2fc4..47161868 100644
--- a/modules/FindBlueZ.cmake
+++ b/modules/FindBlueZ.cmake
@@ -20,20 +20,22 @@ endif ( BLUEZ_INCLUDE_DIR AND BLUEZ_LIBRARIES )
 if( NOT WIN32 )
   find_package(PkgConfig)
 
-  pkg_check_modules(BLUEZ bluez)
+  pkg_check_modules(PC_BLUEZ bluez)
 
-  set(BLUEZ_DEFINITIONS ${BLUEZ_CFLAGS})
+  set(BLUEZ_DEFINITIONS ${PC_BLUEZ_CFLAGS_OTHER})
 endif( NOT WIN32 )
 
 FIND_PATH(BLUEZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h
   PATHS
-  ${BLUEZ_INCLUDE_DIRS}
+  ${PC_BLUEZ_INCLUDEDIR}
+  ${PC_BLUEZ_INCLUDE_DIRS}
   /usr/X11/include
 )
 
 FIND_LIBRARY(BLUEZ_LIBRARIES NAMES bluetooth
   PATHS
-  ${BLUEZ_LIBRARY_DIRS}
+  ${PC_BLUEZ_LIBDIR}
+  ${PC_BLUEZ_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)