aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2008-01-31 20:48:09 +0000
committerLaurent Montel <montel@kde.org>2008-01-31 20:48:09 +0000
commitc926f96b573c3a4182078603e9c37d7c375a442f (patch)
tree9c6a0413136d35e21b0395f65b79ea60da42c212
parente396eb931ba793d36edb09f4201738bf8f782fc9 (diff)
downloadextra-cmake-modules-c926f96b573c3a4182078603e9c37d7c375a442f.tar.gz
extra-cmake-modules-c926f96b573c3a4182078603e9c37d7c375a442f.tar.bz2
Fix problem when pcre is installed after a first configure
svn path=/trunk/KDE/kdelibs/; revision=769201
-rw-r--r--modules/FindPCRE.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index e18b109d..b39d8875 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -11,10 +11,10 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+if (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
# Already in cache, be silent
set(PCRE_FIND_QUIETLY TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
+endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
FIND_PATH(PCRE_INCLUDE_DIR pcre.h PATH_SUFFIXES pcre)
@@ -22,9 +22,9 @@ FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre)
FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix)
-set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
-
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
+
+set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)