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/FindGSSAPI.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/FindGSSAPI.cmake')
| -rw-r--r-- | modules/FindGSSAPI.cmake | 19 |
1 files changed, 4 insertions, 15 deletions
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) |