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