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/FindLibXslt.cmake | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'modules/FindLibXslt.cmake') 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) -- cgit v1.2.1