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/FindOpenSSL.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/FindOpenSSL.cmake')
| -rw-r--r-- | modules/FindOpenSSL.cmake | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake index fde22a84..ed2f4045 100644 --- a/modules/FindOpenSSL.cmake +++ b/modules/FindOpenSSL.cmake @@ -5,14 +5,12 @@ # OPENSSL_INCLUDE_DIR - the OpenSSL include directory # OPENSSL_LIBRARIES - The libraries needed to use OpenSSL -IF (DEFINED CACHED_OPENSSL) +if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) # in cache already - IF ("${CACHED_OPENSSL}" STREQUAL "YES") - SET(OPENSSL_FOUND TRUE) - ENDIF ("${CACHED_OPENSSL}" STREQUAL "YES") + SET(OPENSSL_FOUND TRUE) -ELSE (DEFINED CACHED_OPENSSL) +else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h /usr/include/ @@ -27,12 +25,8 @@ ELSE (DEFINED CACHED_OPENSSL) if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) set(OPENSSL_FOUND TRUE) - set(CACHED_OPENSSL "YES") - else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) - set(CACHED_OPENSSL "NO") endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) - if (OPENSSL_FOUND) if (NOT OpenSSL_FIND_QUIETLY) message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}") @@ -43,7 +37,6 @@ ELSE (DEFINED CACHED_OPENSSL) endif (OpenSSL_FIND_REQUIRED) endif (OPENSSL_FOUND) - set(CACHED_OPENSSL ${CACHED_OPENSSL} CACHE INTERNAL "If openssl was checked") MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES) -ENDIF (DEFINED CACHED_OPENSSL) +endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES) |