-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, 15 insertions, 15 deletions

diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake
index ea7905bd..94d68da4 100644
--- a/modules/FindAGG.cmake
+++ b/modules/FindAGG.cmake
@@ -14,24 +14,24 @@
 if (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 
   # in cache already
-  SET(AGG_FOUND TRUE)
+  set(AGG_FOUND TRUE)
 
 else (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
-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(AGG libagg) 
-  
-  set(AGG_DEFINITIONS ${AGG_CFLAGS})
-ENDIF (NOT WIN32)  
-  FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h
-    ${AGG_INCLUDE_DIRS}
+  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(PC_AGG libagg) 
+
+    set(AGG_DEFINITIONS ${PC_AGG_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_path(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h
+    PATHS ${PC_AGG_INCLUDEDIR} ${PC_AGG_INCLUDE_DIRS}
   )
   
-  FIND_LIBRARY(AGG_LIBRARIES NAMES agg
-    PATHS
-    ${AGG_LIBRARY_DIRS}
+  find_library(AGG_LIBRARIES NAMES agg
+    PATHS ${PC_AGG_LIBDIR} ${PC_AGG_LIBRARY_DIRS}
   )
   
   if (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
@@ -48,6 +48,6 @@ ENDIF (NOT WIN32)
     endif (AGG_FIND_REQUIRED)
   endif (AGG_FOUND)
   
-  MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES)
+  mark_as_advanced(AGG_INCLUDE_DIR AGG_LIBRARIES)
   
 endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES)