diff options
| author | David Faure <faure@kde.org> | 2006-05-11 16:56:59 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-05-11 16:56:59 +0000 |
| commit | a1cd53cff402332c1bcf7a625b33d9330a247608 (patch) | |
| tree | c1e17c42054778348a4e176e6ec494b0a6068a01 /modules/FindAGG.cmake | |
| parent | d46f0af3b68dba8e3bb5461c5b5e37862309875d (diff) | |
| download | extra-cmake-modules-a1cd53cff402332c1bcf7a625b33d9330a247608.tar.gz extra-cmake-modules-a1cd53cff402332c1bcf7a625b33d9330a247608.tar.bz2 | |
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
Diffstat (limited to 'modules/FindAGG.cmake')
| -rw-r--r-- | modules/FindAGG.cmake | 14 |
1 files changed, 4 insertions, 10 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) |