aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarri Porten <porten@kde.org>2008-04-12 21:21:48 +0000
committerHarri Porten <porten@kde.org>2008-04-12 21:21:48 +0000
commit843885e53e3b3d1a45db13e54e93fe92261629c3 (patch)
tree53735e87f785b7384df6803942aa0f284f782b66
parent656cc1fd0189110ca52b3f65808973a54842d897 (diff)
downloadextra-cmake-modules-843885e53e3b3d1a45db13e54e93fe92261629c3.tar.gz
extra-cmake-modules-843885e53e3b3d1a45db13e54e93fe92261629c3.tar.bz2
Merged pkg-config detection for PCRE from trunk.
svn path=/branches/KDE/4.0/kdelibs/; revision=796162
-rw-r--r--modules/FindPCRE.cmake15
1 files 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")