Remove my CACHED_ hacks which break when people install libxml2 after seeing the error

message about it - only use the cache when the check was previously successful, as discussed.

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

9 files changed, 44 insertions, 100 deletions

diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake
index cf336f40..6bd92578 100644
--- a/modules/FindAGG.cmake
+++ b/modules/FindAGG.cmake
@@ -7,14 +7,12 @@
 #  AGG_DEFINITIONS - Compiler switches required for using AGG
 #
 
-IF (DEFINED CACHED_AGG)
+if (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 
   # in cache already
-  IF ("${CACHED_AGG}" STREQUAL "YES")
-    SET(AGG_FOUND TRUE)
-  ENDIF ("${CACHED_AGG}" STREQUAL "YES")
+  SET(AGG_FOUND TRUE)
 
-ELSE (DEFINED CACHED_AGG)
+else (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
 
   # use pkg-config to get the directories and then use these values
   # in the FIND_PATH() and FIND_LIBRARY() calls
@@ -42,12 +40,10 @@ ELSE (DEFINED CACHED_AGG)
   endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
   
   if (AGG_FOUND)
-    set(CACHED_AGG "YES")
     if (NOT AGG_FIND_QUIETLY)
       message(STATUS "Found AGG: ${AGG_LIBRARIES}")
     endif (NOT AGG_FIND_QUIETLY)
   else (AGG_FOUND)
-    set(CACHED_AGG "NO")
     if (AGG_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find AGG")
     endif (AGG_FIND_REQUIRED)
@@ -55,6 +51,4 @@ ELSE (DEFINED CACHED_AGG)
   
   MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES)
   
-  set(CACHED_AGG ${CACHED_AGG} CACHE INTERNAL "If libagg was checked")
-
-ENDIF (DEFINED CACHED_AGG)
+endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES)
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake
index 387d82d9..5f63870a 100644
--- a/modules/FindCups.cmake
+++ b/modules/FindCups.cmake
@@ -7,14 +7,12 @@
 #  CUPS_DEFINITIONS - Compiler switches required for using Cups
 #
 
-IF (DEFINED CACHED_CUPS)
+if (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
 
   # in cache already
-  IF ("${CACHED_CUPS}" STREQUAL "YES")
-    SET(CUPS_FOUND TRUE)
-  ENDIF ("${CACHED_CUPS}" STREQUAL "YES")
+  SET(CUPS_FOUND TRUE)
 
-ELSE (DEFINED CACHED_CUPS)
+else (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
 
   FIND_PATH(CUPS_INCLUDE_DIR cups/cups.h
     /usr/include
@@ -33,18 +31,16 @@ ELSE (DEFINED CACHED_CUPS)
   endif (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
   
   if (CUPS_FOUND)
-    set (CACHED_CUPS "YES")
     if (NOT Cups_FIND_QUIETLY)
       message(STATUS "Found Cups: ${CUPS_LIBRARIES}")
     endif (NOT Cups_FIND_QUIETLY)
   else (CUPS_FOUND)
-    set (CACHED_CUPS "NO")
+    set(CUPS_LIBRARIES )
     if (Cups_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find Cups")
     endif (Cups_FIND_REQUIRED)
   endif (CUPS_FOUND)
   
-  set(CACHED_CUPS ${CACHED_CUPS} CACHE INTERNAL "If cups was checked")
   MARK_AS_ADVANCED(CUPS_INCLUDE_DIR CUPS_LIBRARIES)
   
-ENDIF (DEFINED CACHED_CUPS)
+endif (CUPS_INCLUDE_DIR AND CUPS_LIBRARIES)
diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake
index a89d6181..8fd65a18 100644
--- a/modules/FindGSSAPI.cmake
+++ b/modules/FindGSSAPI.cmake
@@ -6,14 +6,12 @@
 #  GSSAPI_LIBS - the libraries needed to use GSSAPI
 #  GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL
 
-IF (DEFINED CACHED_GSSAPI)
+IF(GSSAPI_LIBS AND GSSAPI_FLAVOR)
 
   # in cache already
-  IF ("${CACHED_GSSAPI}" STREQUAL "YES")
-    SET(GSSAPI_FOUND TRUE)
-  ENDIF ("${CACHED_GSSAPI}" STREQUAL "YES")
+  SET(GSSAPI_FOUND TRUE)
 
-ELSE (DEFINED CACHED_GSSAPI)
+ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR)
 
   FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS
      /usr/bin
@@ -43,7 +41,6 @@ ELSE (DEFINED CACHED_GSSAPI)
     ENDIF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*")
   
     IF(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that
-      SET(CACHED_GSSAPI "YES")
       SET(GSSAPI_FOUND TRUE)
       message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}")
 
@@ -53,16 +50,8 @@ ELSE (DEFINED CACHED_GSSAPI)
 
       MARK_AS_ADVANCED(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR)
 
-    ELSE(GSSAPI_LIBS)
-      SET(CACHED_GSSAPI "NO")
     ENDIF(GSSAPI_LIBS)
   
-  ELSE(KRB5_CONFIG)
-
-      SET(CACHED_GSSAPI "NO")  
-
   ENDIF(KRB5_CONFIG)
-  
-  set(CACHED_GSSAPI ${CACHED_GSSAPI} CACHE INTERNAL "If gssapi (krb5) was checked")
 
-ENDIF (DEFINED CACHED_GSSAPI)
+ENDIF(GSSAPI_LIBS AND GSSAPI_FLAVOR)
diff --git a/modules/FindGettext.cmake b/modules/FindGettext.cmake
index fccd332f..e4dda701 100644
--- a/modules/FindGettext.cmake
+++ b/modules/FindGettext.cmake
@@ -10,14 +10,12 @@
 # functionality can also reside in standalone Gettext library, or the one
 # embedded within kdelibs (cf. gettext.m4 from Gettext source).
 
-IF (DEFINED CACHED_GETTEXT)
+if (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT)
 
   # in cache already
-  IF ("${CACHED_GETTEXT}" STREQUAL "YES")
-    SET(GETTEXT_FOUND TRUE)
-  ENDIF ("${CACHED_GETTEXT}" STREQUAL "YES")
+  SET(GETTEXT_FOUND TRUE)
 
-ELSE (DEFINED CACHED_GETTEXT)
+else (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT)
 
   include(CheckIncludeFiles)
   include(CheckLibraryExists)
@@ -49,19 +47,15 @@ ELSE (DEFINED CACHED_GETTEXT)
   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)
 
-ENDIF(DEFINED CACHED_GETTEXT)
+endif (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index b74da7ee..38f43e5d 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -5,14 +5,12 @@
 #  LIBART_INCLUDE_DIR - the LibArt include directory
 #  LIBART_LIBRARIES - The libraries needed to use LibArt
 
-IF (DEFINED CACHED_LIBART)
+if (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 
   # in cache already
-  IF ("${CACHED_LIBART}" STREQUAL "YES")
-    SET(LIBART_FOUND TRUE)
-  ENDIF ("${CACHED_LIBART}" STREQUAL "YES")
+  SET(LIBART_FOUND TRUE)
 
-ELSE (DEFINED CACHED_LIBART)
+else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
 
   IF (NOT WIN32)
     INCLUDE(UsePkgConfig)
@@ -40,9 +38,6 @@ ELSE (DEFINED CACHED_LIBART)
   
   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)
   
   
@@ -56,7 +51,6 @@ ELSE (DEFINED CACHED_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 (DEFINED CACHED_LIBART)
+endif (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES)
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index 2e671eea..29682e07 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -6,14 +6,12 @@
 #  LIBXML2_LIBRARIES - the libraries needed to use LibXml2
 #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
 
-IF (DEFINED CACHED_LIBXML2)
+if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 
     # in cache already
-    IF ("${CACHED_LIBXML2}" STREQUAL "YES")
-        SET(LIBXML2_FOUND TRUE)
-    ENDIF ("${CACHED_LIBXML2}" STREQUAL "YES")
+    SET(LIBXML2_FOUND TRUE)
 
-ELSE (DEFINED CACHED_LIBXML2)
+else (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 
     IF (NOT WIN32)
         # use pkg-config to get the directories and then use these values
@@ -36,9 +34,6 @@ ELSE (DEFINED CACHED_LIBXML2)
 
     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)
@@ -53,6 +48,4 @@ ELSE (DEFINED CACHED_LIBXML2)
 
     MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
 
-    SET(CACHED_LIBXML2 ${CACHED_LIBXML2} CACHE INTERNAL "If libxml2 was checked")
-
-ENDIF (DEFINED CACHED_LIBXML2)
+endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index afac1f2f..d71cca22 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -7,14 +7,12 @@
 #  LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt
 #
 
-IF (DEFINED CACHED_LIBXSLT)
+if (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 
   # in cache already
-  IF ("${CACHED_LIBXSLT}" STREQUAL "YES")
-    SET(LIBXSLT_FOUND TRUE)
-  ENDIF ("${CACHED_LIBXSLT}" STREQUAL "YES")
+  SET(LIBXSLT_FOUND TRUE)
 
-ELSE (DEFINED CACHED_LIBXSLT)
+else (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
 
   IF (NOT WIN32)
     # use pkg-config to get the directories and then use these values
@@ -39,9 +37,6 @@ ELSE (DEFINED CACHED_LIBXSLT)
   
   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)
@@ -54,7 +49,6 @@ ELSE (DEFINED CACHED_LIBXSLT)
     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 (DEFINED CACHED_LIBXSLT)
+endif (LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARIES)
diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake
index a139a430..34620674 100644
--- a/modules/FindOpenEXR.cmake
+++ b/modules/FindOpenEXR.cmake
@@ -1,13 +1,16 @@
+# Try to find the OpenEXR libraries
+# This check defines:
+#
+#  OPENEXR_FOUND - system has OpenEXR
+#  OPENEXR_INCLUDE_DIR - OpenEXR include directory
+#  OPENEXR_LIBRARIES - Libraries needed to use OpenEXR
 
 
-IF (DEFINED CACHED_OPENEXR)
-
+if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
   # in cache already
-  IF ("${CACHED_OPENEXR}" STREQUAL "YES")
-    SET(OPENEXR_FOUND TRUE)
-  ENDIF ("${CACHED_OPENEXR}" STREQUAL "YES")
+  SET(OPENEXR_FOUND TRUE)
 
-ELSE (DEFINED CACHED_OPENEXR)
+else (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
 
   # use pkg-config to get the directories and then use these values
   # in the FIND_PATH() and FIND_LIBRARY() calls
@@ -52,9 +55,7 @@ ELSE (DEFINED CACHED_OPENEXR)
     /usr/local/lib
   )
   
-  set(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IMATH_LIBRARY} )
-  
-  if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY  AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
+  if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
      set(OPENEXR_FOUND TRUE)
      set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
   endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
@@ -62,12 +63,10 @@ ELSE (DEFINED CACHED_OPENEXR)
   
   
   if (OPENEXR_FOUND)
-    set(CACHED_OPENEXR "YES")
     if (NOT OpenEXR_FIND_QUIETLY)
       message(STATUS "Found OPENEXR: ${OPENEXR_LIBRARIES}")
     endif (NOT OpenEXR_FIND_QUIETLY)
   else (OPENEXR_FOUND)
-    set(CACHED_OPENEXR "NO")
     if (OpenEXR_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find OPENEXR")
     endif (OpenEXR_FIND_REQUIRED)
@@ -81,6 +80,4 @@ ELSE (DEFINED CACHED_OPENEXR)
      OPENEXR_IEX_LIBRARY 
      OPENEXR_HALF_LIBRARY )
   
-  set(CACHED_OPENEXR ${CACHED_OPENEXR} CACHE INTERNAL "If openexr was checked")
-
-ENDIF (DEFINED CACHED_OPENEXR)
+endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index fde22a84..ed2f4045 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -5,14 +5,12 @@
 #  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
 #  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
 
-IF (DEFINED CACHED_OPENSSL)
+if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
 
   # in cache already
-  IF ("${CACHED_OPENSSL}" STREQUAL "YES")
-    SET(OPENSSL_FOUND TRUE)
-  ENDIF ("${CACHED_OPENSSL}" STREQUAL "YES")
+  SET(OPENSSL_FOUND TRUE)
 
-ELSE (DEFINED CACHED_OPENSSL)
+else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
 
   FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
      /usr/include/
@@ -27,12 +25,8 @@ ELSE (DEFINED CACHED_OPENSSL)
   
   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}")
@@ -43,7 +37,6 @@ ELSE (DEFINED CACHED_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 (DEFINED CACHED_OPENSSL)
+endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)