diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-12-02 21:49:01 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-12-02 21:49:01 +0000 |
| commit | c379d4c4e0655fac2dadd4be57e2e5cd23d40572 (patch) | |
| tree | ded75f12990a05a4578511ef667738fcadedc94b /modules/FindPCRE.cmake | |
| parent | 2272394b6ef05df4c4e8996b09aba0d411f249fc (diff) | |
| download | extra-cmake-modules-c379d4c4e0655fac2dadd4be57e2e5cd23d40572.tar.gz extra-cmake-modules-c379d4c4e0655fac2dadd4be57e2e5cd23d40572.tar.bz2 | |
-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
Diffstat (limited to 'modules/FindPCRE.cmake')
| -rw-r--r-- | modules/FindPCRE.cmake | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index 80fdfd9f..efba0652 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -22,17 +22,19 @@ if (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(PCRE libpcre) + pkg_check_modules(PC_PCRE libpcre) - set(PCRE_DEFINITIONS ${PCRE_CFLAGS}) + set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER}) -endif (NOT WIN32) +endif (NOT WIN32) -find_path(PCRE_INCLUDE_DIR pcre.h PATHS ${PCRE_INCLUDE_DIRS} PATH_SUFFIXES pcre) +find_path(PCRE_INCLUDE_DIR pcre.h + HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS} + PATH_SUFFIXES pcre) -find_library(PCRE_PCRE_LIBRARY NAMES pcre PATHS ${PCRE_LIBRARY_DIRS}) +find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS}) -find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix PATHS ${PCRE_LIBRARY_DIRS}) +find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY ) |