diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-05-07 15:07:54 +0000 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-05-07 15:07:54 +0000 |
commit | 126dcd51e5d8d418852ab6c74b238a06a45b0bf9 (patch) | |
tree | 37c09d083622af03647b082c02560e6281ddc5a8 | |
parent | 249e11bd2e3946e1873cc02af03ec4e18ede71a2 (diff) | |
download | libssh-126dcd51e5d8d418852ab6c74b238a06a45b0bf9.tar.gz libssh-126dcd51e5d8d418852ab6c74b238a06a45b0bf9.tar.xz libssh-126dcd51e5d8d418852ab6c74b238a06a45b0bf9.zip |
Improve GCrypt cmake checks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@751 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 4 | ||||
-rw-r--r-- | cmake/Modules/FindGCrypt.cmake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f31ddf08..c24bf6b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,9 @@ find_package(OpenSSL) if (NOT CRYPTO_LIBRARY) find_package(GCrypt) - if (NOT GCRYPT_LIBRARY) + if (NOT GCRYPT_FOUND) message(FATAL_ERROR "Could not find OpenSSL or GCrypt") - endif (NOT GCRYPT_LIBRARY) + endif (NOT GCRYPT_FOUND) endif (NOT CRYPTO_LIBRARY) # config.h checks diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e5fe55d0..1d4761ae 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -41,9 +41,9 @@ if (CRYPTO_LIBRARY) set(HAVE_LIBCRYPTO 1) endif (CRYPTO_LIBRARY) -if (GCRYPT_LIBRARY) +if (GCRYPT_FOUND) set(HAVE_LIBGCRYPT 1) -endif (GCRYPT_LIBRARY) +endif (GCRYPT_FOUND) if (Z_LIBRARY) set(HAVE_LIBZ 1) diff --git a/cmake/Modules/FindGCrypt.cmake b/cmake/Modules/FindGCrypt.cmake index 3c3761c4..23d96b2d 100644 --- a/cmake/Modules/FindGCrypt.cmake +++ b/cmake/Modules/FindGCrypt.cmake @@ -42,7 +42,7 @@ else (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS) mark_as_advanced(GCRYPT_LIBRARY) if (GCRYPT_LIBRARY) - set(GCRYPT_FOUND TRUE) + set(GCRYPT_FOUND TRUE CACHE INTERNAL "Wether the gcrypt library has been found" FORCE) endif (GCRYPT_LIBRARY) set(GCRYPT_INCLUDE_DIRS |