Actually use the cache whenever possible. Should speed up the re-configuring that happens so often.

svn path=/trunk/KDE/kdelibs/; revision=529759

10 files changed, 425 insertions, 281 deletions

diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index a51662b8..d6ade67a 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -6,33 +6,48 @@
 #  BZIP2_LIBRARIES - Link these to use BZip2
 #  BZIP2_DEFINITIONS - Compiler switches required for using BZip2
 #  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
-#
 
-FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h
-  /usr/include
-  /usr/local/include
-)
 
-FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2
-  PATHS
-  /usr/lib
-  /usr/local/lib
-)
+IF (CACHED_BZIP2)
+
+  # in cache already
+  IF ("${CACHED_BZIP2}" STREQUAL "YES")
+    SET(BZIP2_FOUND TRUE)
+  ENDIF ("${CACHED_BZIP2}" STREQUAL "YES")
 
-if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-   set(BZIP2_FOUND TRUE)
-   INCLUDE(CheckLibraryExists)
-   CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+ELSE (CACHED_BZIP2)
 
-if (BZIP2_FOUND)
-  if (NOT BZip2_FIND_QUIETLY)
-    message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
-  endif (NOT BZip2_FIND_QUIETLY)
-else (BZIP2_FOUND)
-  if (BZip2_FIND_REQUIRED)
-    message(FATAL_ERROR "Could NOT find BZip2")
-  endif (BZip2_FIND_REQUIRED)
-endif (BZIP2_FOUND)
+  FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h
+    /usr/include
+    /usr/local/include
+  )
+  
+  FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2
+    PATHS
+    /usr/lib
+    /usr/local/lib
+  )
+  
+  if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+     set(BZIP2_FOUND TRUE)
+     INCLUDE(CheckLibraryExists)
+     CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+     set(CACHED_BZIP2 "YES")
+  else (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+     set(CACHED_BZIP2 "NO")
+  endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+  
+  if (BZIP2_FOUND)
+    if (NOT BZip2_FIND_QUIETLY)
+      message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
+    endif (NOT BZip2_FIND_QUIETLY)
+  else (BZIP2_FOUND)
+    if (BZip2_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find BZip2")
+    endif (BZip2_FIND_REQUIRED)
+  endif (BZIP2_FOUND)
+  
+  set(CACHED_BZIP2 ${CACHED_BZIP2} CACHE INTERNAL "If bzip2 was checked")
+  MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
 
-MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
+ENDIF( CACHED_BZIP2 )
diff --git a/modules/FindGIF.cmake b/modules/FindGIF.cmake
index e3ffdaf1..a4316362 100644
--- a/modules/FindGIF.cmake
+++ b/modules/FindGIF.cmake
@@ -7,29 +7,44 @@
 #  GIF_DEFINITIONS - Compiler switches required for using GIF
 #
 
-FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
-  /usr/include
-  /usr/local/include
-)
+IF (CACHED_GIF)
 
-FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib
-  PATHS
-  /usr/lib
-  /usr/local/lib
-)
+  # in cache already
+  IF ("${CACHED_GIF}" STREQUAL "YES")
+    SET(GIF_FOUND TRUE)
+  ENDIF ("${CACHED_GIF}" STREQUAL "YES")
 
-if (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
-   set(GIF_FOUND TRUE)
-endif (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
+ELSE (CACHED_GIF)
 
-if (GIF_FOUND)
-  if (NOT GIF_FIND_QUIETLY)
-    message(STATUS "Found GIF: ${GIF_LIBRARIES}")
-  endif (NOT GIF_FIND_QUIETLY)
-else (GIF_FOUND)
-  if (GIF_FIND_REQUIRED)
-    message(FATAL_ERROR "Could NOT find GIF")
-  endif (GIF_FIND_REQUIRED)
-endif (GIF_FOUND)
-
-MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES)
+  FIND_PATH(GIF_INCLUDE_DIR gif_lib.h
+    /usr/include
+    /usr/local/include
+  )
+  
+  FIND_LIBRARY(GIF_LIBRARIES NAMES gif libgif ungif libungif giflib
+    PATHS
+    /usr/lib
+    /usr/local/lib
+  )
+  
+  if (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
+     set(GIF_FOUND TRUE)
+     set(CACHED_GIF "YES")
+  else (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
+     set(CACHED_GIF "NO")
+  endif (GIF_INCLUDE_DIR AND GIF_LIBRARIES)
+  
+  if (GIF_FOUND)
+    if (NOT GIF_FIND_QUIETLY)
+      message(STATUS "Found GIF: ${GIF_LIBRARIES}")
+    endif (NOT GIF_FIND_QUIETLY)
+  else (GIF_FOUND)
+    if (GIF_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find GIF")
+    endif (GIF_FIND_REQUIRED)
+  endif (GIF_FOUND)
+  
+  set(CACHED_GIF ${CACHED_GIF} CACHE INTERNAL "If gif was checked")
+  MARK_AS_ADVANCED(GIF_INCLUDE_DIR GIF_LIBRARIES)
+  
+ENDIF (CACHED_GIF)
diff --git a/modules/FindGettext.cmake b/modules/FindGettext.cmake
index a117ebf7..3a3b6902 100644
--- a/modules/FindGettext.cmake
+++ b/modules/FindGettext.cmake
@@ -10,43 +10,58 @@
 # functionality can also reside in standalone Gettext library, or the one
 # embedded within kdelibs (cf. gettext.m4 from Gettext source).
 
-include(CheckIncludeFiles)
-include(CheckLibraryExists)
-include(CheckFunctionExists)
+IF (CACHED_GETTEXT)
 
-check_include_files(libintl.h HAVE_LIBINTL_H)
+  # in cache already
+  IF ("${CACHED_GETTEXT}" STREQUAL "YES")
+    SET(GETTEXT_FOUND TRUE)
+  ENDIF ("${CACHED_GETTEXT}" STREQUAL "YES")
 
-set(GETTEXT_INCLUDE_DIR)
-set(GETTEXT_LIBRARIES)
+ELSE (CACHED_GETTEXT)
 
-if (HAVE_LIBINTL_H)
-   check_function_exists(dgettext LIBC_HAS_DGETTEXT)
-   if (LIBC_HAS_DGETTEXT)
-      set(GETTEXT_SOURCE "built in libc")
-      set(GETTEXT_FOUND TRUE)
-   else (LIBC_HAS_DGETTEXT)
-      FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
-         PATHS
-         /usr/lib
-         /usr/local/lib
-      )
-      CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-      if (LIBINTL_HAS_DGETTEXT)
-         set(GETTEXT_SOURCE "in ${LIBINTL_LIBRARY}")
-         set(GETTEXT_LIBRARIES ${LIBINTL_LIBRARY})
-         set(GETTEXT_FOUND TRUE)
-      endif (LIBINTL_HAS_DGETTEXT)
-   endif (LIBC_HAS_DGETTEXT)
-endif (HAVE_LIBINTL_H)
+  include(CheckIncludeFiles)
+  include(CheckLibraryExists)
+  include(CheckFunctionExists)
+  
+  check_include_files(libintl.h HAVE_LIBINTL_H)
+  
+  set(GETTEXT_INCLUDE_DIR)
+  set(GETTEXT_LIBRARIES)
+  
+  if (HAVE_LIBINTL_H)
+     check_function_exists(dgettext LIBC_HAS_DGETTEXT)
+     if (LIBC_HAS_DGETTEXT)
+        set(GETTEXT_SOURCE "built in libc")
+        set(GETTEXT_FOUND TRUE)
+     else (LIBC_HAS_DGETTEXT)
+        FIND_LIBRARY(LIBINTL_LIBRARY NAMES intl libintl
+           PATHS
+           /usr/lib
+           /usr/local/lib
+        )
+        CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
+        if (LIBINTL_HAS_DGETTEXT)
+           set(GETTEXT_SOURCE "in ${LIBINTL_LIBRARY}")
+           set(GETTEXT_LIBRARIES ${LIBINTL_LIBRARY} CACHE FILEPATH "path to libintl library, used for gettext")
+           set(GETTEXT_FOUND TRUE)
+        endif (LIBINTL_HAS_DGETTEXT)
+     endif (LIBC_HAS_DGETTEXT)
+  endif (HAVE_LIBINTL_H)
+  
+  if (GETTEXT_FOUND)
+     set(CACHED_GETTEXT "YES")
+     if (NOT Gettext_FIND_QUIETLY)
+        message(STATUS "Found Gettext: ${GETTEXT_SOURCE}")
+     endif (NOT Gettext_FIND_QUIETLY)
+  else (GETTEXT_FOUND)
+     if (Gettext_FIND_REQUIRED)
+        message(STATUS "Could NOT find Gettext")
+     else (Gettext_FIND_REQUIRED)
+        set(CACHED_GETTEXT "NO")
+     endif (Gettext_FIND_REQUIRED)
+  endif (GETTEXT_FOUND)
+  
+  set(CACHED_GETTEXT ${CACHED_GETTEXT} CACHE INTERNAL "If gettext was checked")
+  MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR GETTEXT_LIBRARIES)
 
-if (GETTEXT_FOUND)
-   if (NOT Gettext_FIND_QUIETLY)
-      message(STATUS "Found Gettext: ${GETTEXT_SOURCE}")
-   endif (NOT Gettext_FIND_QUIETLY)
-else (GETTEXT_FOUND)
-   if (Gettext_FIND_REQUIRED)
-      message(STATUS "Could NOT find Gettext")
-   endif (Gettext_FIND_REQUIRED)
-endif (GETTEXT_FOUND)
-
-MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR GETTEXT_LIBRARIES)
+ENDIF( CACHED_GETTEXT )
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index c1528bb3..430facb5 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -5,42 +5,56 @@
 #  LIBART_INCLUDE_DIR - the LibArt include directory
 #  LIBART_LIBRARIES - The libraries needed to use LibArt
 
-IF (NOT WIN32)
-	INCLUDE(UsePkgConfig)
-	# use pkg-config to get the directories and then use these values
-	# in the FIND_PATH() and FIND_LIBRARY() calls
-	PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags)
-	set(LIBART_DEFINITIONS ${_libArtCflags})
-ENDIF (NOT WIN32)
-
-FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h
-   ${_libArtIncDir}/libart-2.0
-   /usr/include/libart-2.0
-   /usr/local/include/libart-2.0
-)
-
-FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
-   PATHS
-   ${_libArtLinkDir}
-   /usr/lib
-   /usr/local/lib
-)
-
-
-if (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
-   set(LIBART_FOUND TRUE)
-endif (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
-
-
-if (LIBART_FOUND)
-   if (NOT LibArt_FIND_QUIETLY)
-      message(STATUS "Found libart: ${LIBART_LIBRARIES}")
-   endif (NOT LibArt_FIND_QUIETLY)
-else (LIBART_FOUND)
-   if (LibArt_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find libart")
-   endif (LibArt_FIND_REQUIRED)
-endif (LIBART_FOUND)
-
-MARK_AS_ADVANCED(LIBART_INCLUDE_DIR LIBART_LIBRARIES)
-
+IF (CACHED_LIBART)
+
+  # in cache already
+  IF ("${CACHED_LIBART}" STREQUAL "YES")
+    SET(LIBART_FOUND TRUE)
+  ENDIF ("${CACHED_LIBART}" STREQUAL "YES")
+
+ELSE (CACHED_LIBART)
+
+  IF (NOT WIN32)
+    INCLUDE(UsePkgConfig)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    PKGCONFIG(libart-2.0 _libArtIncDir _libArtLinkDir _libArtLinkFlags _libArtCflags)
+    set(LIBART_DEFINITIONS ${_libArtCflags})
+  ENDIF (NOT WIN32)
+
+  FIND_PATH(LIBART_INCLUDE_DIR libart_lgpl/libart.h
+     ${_libArtIncDir}/libart-2.0
+     /usr/include/libart-2.0
+     /usr/local/include/libart-2.0
+  )
+  
+  FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2
+     PATHS
+     ${_libArtLinkDir}
+     /usr/lib
+     /usr/local/lib
+  )
+  
+  
+  if (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
+     set(LIBART_FOUND TRUE)
+     set(CACHED_LIBART "YES")
+  else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
+     set(CACHED_LIBART "NO")
+  endif (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
+  
+  
+  if (LIBART_FOUND)
+     if (NOT LibArt_FIND_QUIETLY)
+        message(STATUS "Found libart: ${LIBART_LIBRARIES}")
+     endif (NOT LibArt_FIND_QUIETLY)
+  else (LIBART_FOUND)
+     if (LibArt_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find libart")
+     endif (LibArt_FIND_REQUIRED)
+  endif (LIBART_FOUND)
+
+  set(CACHED_LIBART ${CACHED_LIBART} CACHE INTERNAL "If libart was checked")
+  MARK_AS_ADVANCED(LIBART_INCLUDE_DIR LIBART_LIBRARIES)
+
+ENDIF (CACHED_LIBART)
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index deb09c65..b7914be1 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -5,39 +5,54 @@
 #  LIBXML2_INCLUDE_DIR - the LibXml2 include directory
 #  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
 #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
-#
 
-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(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
-	set(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
-ENDIF (NOT WIN32)
-
-FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
-  PATHS
- ${_LibXml2IncDir}
-  PATH_SUFFIXES libxml2
-)
-
-FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
-  PATHS
-  ${_LibXml2LinkDir}
-)
-
-if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   set(LIBXML2_FOUND TRUE)
-endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-
-if (LIBXML2_FOUND)
-  if (NOT LibXml2_FIND_QUIETLY)
-    message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
-  endif (NOT LibXml2_FIND_QUIETLY)
-else (LIBXML2_FOUND)
-  if (LibXml2_FIND_REQUIRED)
-    message(SEND_ERROR "Could NOT find LibXml2")
-  endif (LibXml2_FIND_REQUIRED)
-endif (LIBXML2_FOUND)
-
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
+IF (CACHED_LIBXML2)
+
+    # in cache already
+    IF ("${CACHED_LIBXML2}" STREQUAL "YES")
+        SET(LIBXML2_FOUND TRUE)
+    ENDIF ("${CACHED_LIBXML2}" STREQUAL "YES")
+
+ELSE (CACHED_LIBXML2)
+
+    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(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
+        set(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
+    ENDIF (NOT WIN32)
+
+    FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
+      PATHS
+     ${_LibXml2IncDir}
+      PATH_SUFFIXES libxml2
+    )
+
+    FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
+      PATHS
+      ${_LibXml2LinkDir}
+    )
+
+    if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+       set(LIBXML2_FOUND TRUE)
+       set(CACHED_LIBXML2 "YES")
+    else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+       set(CACHED_LIBXML2 "NO")
+    endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+
+    if (LIBXML2_FOUND)
+      if (NOT LibXml2_FIND_QUIETLY)
+        message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
+      endif (NOT LibXml2_FIND_QUIETLY)
+    else (LIBXML2_FOUND)
+      if (LibXml2_FIND_REQUIRED)
+        message(SEND_ERROR "Could NOT find LibXml2")
+      endif (LibXml2_FIND_REQUIRED)
+    endif (LIBXML2_FOUND)
+
+    MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
+
+    SET(CACHED_LIBXML2 ${CACHED_LIBXML2} CACHE INTERNAL "If libxml2 was checked")
+
+ENDIF (CACHED_LIBXML2)
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index d33fca26..bf49814d 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -7,40 +7,54 @@
 #  LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt
 #
 
-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(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags)
-	set(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
-ENDIF (NOT WIN32)
+IF (CACHED_LIBXSLT)
 
-FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
-  ${_LibXsltIncDir}
-  /usr/include
-  /usr/local/include
-)
+  # in cache already
+  IF ("${CACHED_LIBXSLT}" STREQUAL "YES")
+    SET(LIBXSLT_FOUND TRUE)
+  ENDIF ("${CACHED_LIBXSLT}" STREQUAL "YES")
 
-FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
-  PATHS
-  ${_LibXsltLinkDir}
-  /usr/lib
-  /usr/local/lib
-)
+ELSE (CACHED_LIBXSLT)
 
-if (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
-   set(LIBXSLT_FOUND TRUE)
-endif (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
+  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(libxslt _LibXsltIncDir _LibXsltLinkDir _LibXsltLinkFlags _LibXsltCflags)
+    set(LIBXSLT_DEFINITIONS ${_LibXsltCflags})
+  ENDIF (NOT WIN32)
 
-if (LIBXSLT_FOUND)
-  if (NOT LibXslt_FIND_QUIETLY)
+  FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h
+    ${_LibXsltIncDir}
+    /usr/include
+    /usr/local/include
+  )
+  
+  FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
+    PATHS
+    ${_LibXsltLinkDir}
+    /usr/lib
+    /usr/local/lib
+  )
+  
+  if (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
+     set(LIBXSLT_FOUND TRUE)
+     set(CACHED_LIBXSLT "YES")
+  else (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
+     set(CACHED_LIBXSLT "NO")
+  endif (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
+  
+  if (LIBXSLT_FOUND)
+    if (NOT LibXslt_FIND_QUIETLY)
     message(STATUS "Found LibXslt: ${LIBXSLT_LIBRARIES}")
-  endif (NOT LibXslt_FIND_QUIETLY)
-else (LIBXSLT_FOUND)
-  if (LibXslt_FIND_REQUIRED)
+    endif (NOT LibXslt_FIND_QUIETLY)
+  else (LIBXSLT_FOUND)
+    if (LibXslt_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find LibXslt")
-  endif (LibXslt_FIND_REQUIRED)
-endif (LIBXSLT_FOUND)
-
-MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)
-
+    endif (LibXslt_FIND_REQUIRED)
+  endif (LIBXSLT_FOUND)
+  
+  set(CACHED_LIBXSLT ${CACHED_LIBXSLT} CACHE INTERNAL "If libxslt was checked")
+  MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)
+  
+ENDIF (CACHED_LIBXSLT)
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 5449f1f6..bdc85685 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -5,31 +5,45 @@
 #  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
 #  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
 
-FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
-   /usr/include/
-   /usr/local/include/
-)
+IF (CACHED_OPENSSL)
 
-FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
-   PATHS
-   /usr/lib
-   /usr/local/lib
-)
+  # in cache already
+  IF ("${CACHED_OPENSSL}" STREQUAL "YES")
+    SET(OPENSSL_FOUND TRUE)
+  ENDIF ("${CACHED_OPENSSL}" STREQUAL "YES")
 
-if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
-   set(OPENSSL_FOUND TRUE)
-endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
-
-
-if (OPENSSL_FOUND)
-   if (NOT OpenSSL_FIND_QUIETLY)
-      message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
-   endif (NOT OpenSSL_FIND_QUIETLY)
-else (OPENSSL_FOUND)
-   if (OpenSSL_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find OpenSSL")
-   endif (OpenSSL_FIND_REQUIRED)
-endif (OPENSSL_FOUND)
-
-MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
+ELSE (CACHED_OPENSSL)
 
+  FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
+     /usr/include/
+     /usr/local/include/
+  )
+  
+  FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
+     PATHS
+     /usr/lib
+     /usr/local/lib
+  )
+  
+  if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
+     set(OPENSSL_FOUND TRUE)
+     set(CACHED_OPENSSL "YES")
+  else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
+     set(CACHED_OPENSSL "NO")
+  endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
+  
+  
+  if (OPENSSL_FOUND)
+     if (NOT OpenSSL_FIND_QUIETLY)
+        message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
+     endif (NOT OpenSSL_FIND_QUIETLY)
+  else (OPENSSL_FOUND)
+     if (OpenSSL_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find OpenSSL")
+     endif (OpenSSL_FIND_REQUIRED)
+  endif (OPENSSL_FOUND)
+  
+  set(CACHED_OPENSSL ${CACHED_OPENSSL} CACHE INTERNAL "If openssl was checked")
+  MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
+  
+ENDIF (CACHED_OPENSSL)
diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake
index c5301316..2898a7d9 100644
--- a/modules/FindPCRE.cmake
+++ b/modules/FindPCRE.cmake
@@ -5,38 +5,52 @@
 #  PCRE_INCLUDE_DIR - the PCRE include directory
 #  PCRE_LIBRARIES - The libraries needed to use PCRE
 
-FIND_PATH(PCRE_INCLUDE_DIR pcre.h
+IF (CACHED_PCRE)
+
+  # in cache already
+  IF ("${CACHED_PCRE}" STREQUAL "YES")
+    SET(PCRE_FOUND TRUE)
+  ENDIF ("${CACHED_PCRE}" STREQUAL "YES")
+
+ELSE (CACHED_PCRE)
+
+  FIND_PATH(PCRE_INCLUDE_DIR pcre.h
    /usr/include/
    /usr/local/include/
-)
+  )
 
-FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre
+  FIND_LIBRARY(PCRE_PCRE_LIBRARY NAMES pcre
    PATHS
    /usr/lib
    /usr/local/lib
-)
+  )
 
-FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
+  FIND_LIBRARY(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix
    PATHS
    /usr/lib
    /usr/local/lib
-)
-
-set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
-
-if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
-   set(PCRE_FOUND TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
-
-
-if (PCRE_FOUND)
-   if (NOT PCRE_FIND_QUIETLY)
-      message(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
-   endif (NOT PCRE_FIND_QUIETLY)
-else (PCRE_FOUND)
-   if (PCRE_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find PCRE")
-   endif (PCRE_FIND_REQUIRED)
-endif (PCRE_FOUND)
-
-MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
+  )
+
+  set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY} CACHE STRING "The libraries needed to use PCRE")
+
+  if (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+     set(PCRE_FOUND TRUE)
+     set(CACHED_PCRE "YES")
+  else (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+     set(CACHED_PCRE "NO")
+  endif (PCRE_INCLUDE_DIR AND PCRE_LIBRARIES)
+
+  if (PCRE_FOUND)
+     if (NOT PCRE_FIND_QUIETLY)
+        message(STATUS "Found PCRE: ${PCRE_LIBRARIES}")
+     endif (NOT PCRE_FIND_QUIETLY)
+  else (PCRE_FOUND)
+     if (PCRE_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find PCRE")
+     endif (PCRE_FIND_REQUIRED)
+  endif (PCRE_FOUND)
+
+  set(CACHED_PCRE ${CACHED_PCRE} CACHE INTERNAL "If pcre was checked")
+  MARK_AS_ADVANCED(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
+
+ENDIF (CACHED_PCRE)
diff --git a/modules/FindTIFF.cmake b/modules/FindTIFF.cmake
index d0c13d67..875797fd 100644
--- a/modules/FindTIFF.cmake
+++ b/modules/FindTIFF.cmake
@@ -7,32 +7,47 @@
 # also defined, but NOT for general use are
 #  TIFF_LIBRARY, where to find the TIFF library.
 
-FIND_PATH(TIFF_INCLUDE_DIR tiff.h
-  /usr/local/include
-  /usr/include
-)
+IF (CACHED_TIFF)
 
-set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
-FIND_LIBRARY(TIFF_LIBRARY
-  NAMES ${TIFF_NAMES}
-  PATHS /usr/lib /usr/local/lib
-)
+  # in cache already
+  IF ("${CACHED_TIFF}" STREQUAL "YES")
+    SET(TIFF_FOUND TRUE)
+  ENDIF ("${CACHED_TIFF}" STREQUAL "YES")
 
+ELSE (CACHED_TIFF)
 
-if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
-   set(TIFF_FOUND "YES")
-   set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
-endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+  FIND_PATH(TIFF_INCLUDE_DIR tiff.h
+    /usr/local/include
+    /usr/include
+  )
+  
+  set(TIFF_NAMES ${TIFF_NAMES} tiff libtiff)
+  FIND_LIBRARY(TIFF_LIBRARY
+    NAMES ${TIFF_NAMES}
+    PATHS /usr/lib /usr/local/lib
+  )
+  
+  
+  if (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+     set(TIFF_FOUND TRUE)
+     set(TIFF_LIBRARIES ${TIFF_LIBRARY} )
+     set(CACHED_TIFF "YES")
+  else (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+     set(CACHED_TIFF "NO")
+  endif (TIFF_INCLUDE_DIR AND TIFF_LIBRARY)
+  
+  
+  if (TIFF_FOUND)
+     if (NOT TIFF_FIND_QUIETLY)
+        message(STATUS "Found TIFF: ${TIFF_LIBRARY}")
+     endif (NOT TIFF_FIND_QUIETLY)
+  else (TIFF_FOUND)
+     if (TIFF_FIND_REQUIRED)
+        message(FATAL_ERROR "Could NOT find TIFF")
+     endif (TIFF_FIND_REQUIRED)
+  endif (TIFF_FOUND)
 
+  set(CACHED_TIFF ${CACHED_TIFF} CACHE INTERNAL "If tiff was checked")
+  MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY)
 
-if (TIFF_FOUND)
-   if (NOT TIFF_FIND_QUIETLY)
-      message(STATUS "Found TIFF: ${TIFF_LIBRARY}")
-   endif (NOT TIFF_FIND_QUIETLY)
-else (TIFF_FOUND)
-   if (TIFF_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find TIFF")
-   endif (TIFF_FIND_REQUIRED)
-endif (TIFF_FOUND)
-
-MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY )
+ENDIF (CACHED_TIFF)
diff --git a/modules/FindZLIB.cmake b/modules/FindZLIB.cmake
index b3df2bae..0348cdd7 100644
--- a/modules/FindZLIB.cmake
+++ b/modules/FindZLIB.cmake
@@ -1,28 +1,41 @@
+IF (CACHED_ZLIB)
 
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+  # in cache already
+  IF ("${CACHED_ZLIB}" STREQUAL "YES")
+    SET(ZLIB_FOUND TRUE)
+  ENDIF ("${CACHED_ZLIB}" STREQUAL "YES")
+
+ELSE (CACHED_ZLIB)
+
+  FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
    /usr/include
    /usr/local/include
-)
+  )
 
-FIND_LIBRARY(ZLIB_LIBRARY NAMES z zlib
-PATHS
+  FIND_LIBRARY(ZLIB_LIBRARY NAMES z zlib
+  PATHS
    /usr/lib
    /usr/local/lib
-)
+  )
 
-IF (ZLIB_INCLUDE_DIR)
-   SET(ZLIB_FOUND TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
+  IF (ZLIB_INCLUDE_DIR)
+     SET(ZLIB_FOUND TRUE)
+     SET(CACHED_ZLIB "YES")
+  ELSE (ZLIB_INCLUDE_DIR)
+     SET(CACHED_ZLIB "NO")
+  ENDIF (ZLIB_INCLUDE_DIR)
 
+  IF (ZLIB_FOUND)
+     IF (NOT ZLIB_FIND_QUIETLY)
+        MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
+     ENDIF (NOT ZLIB_FIND_QUIETLY)
+  ELSE (ZLIB_FOUND)
+     IF (ZLIB_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find z library")
+     ENDIF (ZLIB_FIND_REQUIRED)
+  ENDIF (ZLIB_FOUND)
 
-IF (ZLIB_FOUND)
-   IF (NOT ZLIB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
-   ENDIF (NOT ZLIB_FIND_QUIETLY)
-ELSE (ZLIB_FOUND)
-   IF (ZLIB_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find z library")
-   ENDIF (ZLIB_FIND_REQUIRED)
-ENDIF (ZLIB_FOUND)
+  SET(CACHED_ZLIB ${CACHED_ZLIB} CACHE INTERNAL "If zlib was checked")
+  MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+ENDIF (CACHED_ZLIB)