From 843885e53e3b3d1a45db13e54e93fe92261629c3 Mon Sep 17 00:00:00 2001 From: Harri Porten Date: Sat, 12 Apr 2008 21:21:48 +0000 Subject: Merged pkg-config detection for PCRE from trunk. svn path=/branches/KDE/4.0/kdelibs/; revision=796162 --- modules/FindPCRE.cmake | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index f0cc940d..af8aaff2 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -16,11 +16,20 @@ if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE set(PCRE_FIND_QUIETLY TRUE) endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY) -FIND_PATH(PCRE_INCLUDE_DIR pcre.h ) -FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre) +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG(libpcre _PCREIncDir _PCRELinkDir _PCRELinkFlags _PCRECflags) +ENDIF (NOT WIN32) -FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix) +FIND_PATH(PCRE_INCLUDE_DIR pcre.h PATHS ${_PCREIncDir} PATH_SUFFIXES pcre) + +FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre PATHS ${_PCRELinkDir}) + +FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix PATHS ${_PCRELinkDir}) set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE") -- cgit v1.2.1