From c379d4c4e0655fac2dadd4be57e2e5cd23d40572 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 2 Dec 2008 21:49:01 +0000 Subject: -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 --- modules/FindBlitz.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/FindBlitz.cmake') diff --git a/modules/FindBlitz.cmake b/modules/FindBlitz.cmake index ed439458..2427999e 100644 --- a/modules/FindBlitz.cmake +++ b/modules/FindBlitz.cmake @@ -23,7 +23,7 @@ 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(BLITZ qimageblitz) + pkg_check_modules(PC_BLITZ qimageblitz) endif (NOT WIN32) find_path(BLITZ_INCLUDES @@ -32,7 +32,8 @@ find_path(BLITZ_INCLUDES PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include - ${BLITZ_INCLUDE_DIRS} + ${PC_BLITZ_INCLUDEDIR} + ${PC_BLITZ_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -42,7 +43,8 @@ find_library_with_debug(BLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib - ${BLITZ_LIBRARY_DIRS} + ${PC_BLITZ_LIBRARY_DIRS} + ${PC_BLITZ_LIBDIR} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) -- cgit v1.2.1