Improve GCrypt cmake checks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@751 7dcaeef0-15fb-0310-b436-a5af3365683c
Этот коммит содержится в:
родитель
249e11bd2e
Коммит
126dcd51e5
@ -42,9 +42,9 @@ find_package(OpenSSL)
|
|||||||
|
|
||||||
if (NOT CRYPTO_LIBRARY)
|
if (NOT CRYPTO_LIBRARY)
|
||||||
find_package(GCrypt)
|
find_package(GCrypt)
|
||||||
if (NOT GCRYPT_LIBRARY)
|
if (NOT GCRYPT_FOUND)
|
||||||
message(FATAL_ERROR "Could not find OpenSSL or GCrypt")
|
message(FATAL_ERROR "Could not find OpenSSL or GCrypt")
|
||||||
endif (NOT GCRYPT_LIBRARY)
|
endif (NOT GCRYPT_FOUND)
|
||||||
endif (NOT CRYPTO_LIBRARY)
|
endif (NOT CRYPTO_LIBRARY)
|
||||||
|
|
||||||
# config.h checks
|
# config.h checks
|
||||||
|
@ -41,9 +41,9 @@ if (CRYPTO_LIBRARY)
|
|||||||
set(HAVE_LIBCRYPTO 1)
|
set(HAVE_LIBCRYPTO 1)
|
||||||
endif (CRYPTO_LIBRARY)
|
endif (CRYPTO_LIBRARY)
|
||||||
|
|
||||||
if (GCRYPT_LIBRARY)
|
if (GCRYPT_FOUND)
|
||||||
set(HAVE_LIBGCRYPT 1)
|
set(HAVE_LIBGCRYPT 1)
|
||||||
endif (GCRYPT_LIBRARY)
|
endif (GCRYPT_FOUND)
|
||||||
|
|
||||||
if (Z_LIBRARY)
|
if (Z_LIBRARY)
|
||||||
set(HAVE_LIBZ 1)
|
set(HAVE_LIBZ 1)
|
||||||
|
@ -42,7 +42,7 @@ else (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
|
|||||||
mark_as_advanced(GCRYPT_LIBRARY)
|
mark_as_advanced(GCRYPT_LIBRARY)
|
||||||
|
|
||||||
if (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)
|
endif (GCRYPT_LIBRARY)
|
||||||
|
|
||||||
set(GCRYPT_INCLUDE_DIRS
|
set(GCRYPT_INCLUDE_DIRS
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user