From a1cd53cff402332c1bcf7a625b33d9330a247608 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 11 May 2006 16:56:59 +0000 Subject: 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 --- modules/FindLibXml2.cmake | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'modules/FindLibXml2.cmake') 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) -- cgit v1.2.1