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/FindLCMS.cmake | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'modules/FindLCMS.cmake') diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index 97ac7ef1..52109933 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -9,31 +9,23 @@ # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls if(NOT WIN32) -find_package(PkgConfig) -pkg_check_modules(LCMS lcms) -set(LCMS_DEFINITIONS ${LCMS_CFLAGS}) + find_package(PkgConfig) + pkg_check_modules(PC_LCMS lcms) + set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER}) endif(NOT WIN32) find_path(LCMS_INCLUDE_DIR lcms.h - ${LCMS_INCLUDE_DIRS} - ${CMAKE_INSTALL_PREFIX}/include - /usr/include/lcms - /usr/include/liblcms1 - /usr/local/include/lcms - NO_DEFAULT_PATH -) -find_path(LCMS_INCLUDE_DIR lcms.h + PATHS + ${PC_LCMS_INCLUDEDIR} + ${PC_LCMS_INCLUDE_DIRS} + PATH_SUFFIXES lcms liblcms1 ) find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1 PATHS - ${LCMS_LIBRARY_DIRS} - ${CMAKE_INSTALL_PREFIX}/lib - /usr/lib/lcms - /usr/local/lib/lcms - NO_DEFAULT_PATH -) -find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1 + ${PC_LCMS_LIBDIR} + ${PC_LCMS_LIBRARY_DIRS} + PATH_SUFFIXES lcms ) if(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES) -- cgit v1.2.1