From 0ed2ae85935be59b3fee5663a9906c4260cd64cc Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 13 Sep 2017 17:00:55 +0200 Subject: build: Fix DDNS tool detection for shim-udp This fixes output when detecting DDNS tools and homogenizes output and the APIs used to pass variables between the build system and the sources. Fixes some minor issues and typos). --- src/lib/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/lib/CMakeLists.txt') diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index f126a52a..5a09c52e 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -41,7 +41,7 @@ if (HAVE_ROBUST_MUTEX) endif () endif () -find_library(LIBGCRYPT_LIBRARIES gcrypt) +find_library(LIBGCRYPT_LIBRARIES gcrypt QUIET) if (LIBGCRYPT_LIBRARIES) find_path(LIBGCRYPT_INCLUDE_DIR gcrypt.h HINTS /usr/include /usr/local/include) @@ -50,18 +50,17 @@ if (LIBGCRYPT_LIBRARIES) REGEX "^#define GCRYPT_VERSION ") string(REGEX REPLACE "^#define GCRYPT_VERSION \"(.*)\".*$" "\\1" GCVER "${GCSTR}") - message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES} " - "(found version \"${GCVER}\")") if (NOT GCVER VERSION_LESS "1.7.0") set (DISABLE_LIBGCRYPT FALSE CACHE BOOL "Disable libgcrypt support") if (NOT DISABLE_LIBGCRYPT) message(STATUS "libgcrypt support enabled") set(HAVE_LIBGCRYPT TRUE) else () - message(STATUS "libgcrpyt support disabled by user") + message(STATUS "libgcrypt support disabled by user") endif() else () - message(STATUS "Install version > \"1.7.0\" to enable libgcrypt support") + message(STATUS "Install version > \"1.7.0\" to enable libgcrypt support " + "(found version \"${GCVER})\"") endif() endif () endif () @@ -71,7 +70,7 @@ if (NOT HAVE_LIBGCRYPT) set(LIBGCRYPT_INCLUDE_DIR "") endif () -find_package(OpenSSL) +find_package(OpenSSL QUIET) if (OPENSSL_FOUND) set (DISABLE_OPENSSL FALSE CACHE BOOL "Disable OpenSSL support") if (NOT DISABLE_OPENSSL) -- cgit v1.2.3