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/FindXine.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindXine.cmake') diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake index 9452e781..1223851b 100644 --- a/modules/FindXine.cmake +++ b/modules/FindXine.cmake @@ -27,11 +27,13 @@ endif (PKG_CONFIG_FOUND) find_path(XINE_INCLUDE_DIR NAMES xine.h HINTS # HINTS is new in cmake 2.6. These dirs will be preferred over the default ones ${PC_LIBXINE_INCLUDEDIR} + ${PC_LIBXINE_INCLUDE_DIRS} ) find_library(XINE_LIBRARY NAMES xine HINTS ${PC_LIBXINE_LIBDIR} + ${PC_LIBXINE_LIBRARY_DIRS} ) find_program(XINECONFIG_EXECUTABLE NAMES xine-config -- cgit v1.2.1