From 8788bb90a89321e447729ab55f86b887d9eb8ce7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 13 Apr 2024 19:45:05 +0000 Subject: [PATCH] cmake: style tidy-up (more) Follow-up to 3fa5282d6284efba62dc591697e6a687152bdcb1 #1166 Closes #1365 --- cmake/FindLibgcrypt.cmake | 4 ++-- cmake/FindmbedTLS.cmake | 4 ++-- cmake/Findwolfssl.cmake | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/FindLibgcrypt.cmake b/cmake/FindLibgcrypt.cmake index 8fbe6fff..f3451da6 100644 --- a/cmake/FindLibgcrypt.cmake +++ b/cmake/FindLibgcrypt.cmake @@ -41,9 +41,9 @@ # LIBGCRYPT_INCLUDE_DIRS - The Libgcrypt include directories # LIBGCRYPT_LIBRARIES - The libraries needed to use Libgcrypt -find_path(LIBGCRYPT_INCLUDE_DIR gcrypt.h) +find_path(LIBGCRYPT_INCLUDE_DIR "gcrypt.h") -find_library(LIBGCRYPT_LIBRARY NAMES gcrypt libgcrypt) +find_library(LIBGCRYPT_LIBRARY NAMES "gcrypt" "libgcrypt") set(LIBGCRYPT_LIBRARIES ${LIBGCRYPT_LIBRARY}) set(LIBGCRYPT_INCLUDE_DIRS ${LIBGCRYPT_INCLUDE_DIR}) diff --git a/cmake/FindmbedTLS.cmake b/cmake/FindmbedTLS.cmake index 18c9739d..4dff9bb4 100644 --- a/cmake/FindmbedTLS.cmake +++ b/cmake/FindmbedTLS.cmake @@ -10,8 +10,8 @@ # MBEDTLS_FOUND - system has mbedTLS # MBEDTLS_LIBRARIES - link these to use mbedTLS -find_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/version.h) -find_library(MBEDCRYPTO_LIBRARY NAMES mbedcrypto libmbedcrypto) +find_path(MBEDTLS_INCLUDE_DIR NAMES "mbedtls/version.h") +find_library(MBEDCRYPTO_LIBRARY NAMES "mbedcrypto" "libmbedcrypto") if(MBEDTLS_INCLUDE_DIR) file(READ "${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h" _mbedtls_header_1) diff --git a/cmake/Findwolfssl.cmake b/cmake/Findwolfssl.cmake index 7418811c..41e9e986 100644 --- a/cmake/Findwolfssl.cmake +++ b/cmake/Findwolfssl.cmake @@ -8,14 +8,14 @@ # WOLFSSL_LIBRARIES - The libraries needed to use wolfssl find_package(PkgConfig QUIET) -pkg_check_modules(PC_WOLFSSL QUIET wolfssl) +pkg_check_modules(PC_WOLFSSL QUIET "wolfssl") find_path(WOLFSSL_INCLUDE_DIR - NAMES wolfssl/options.h + NAMES "wolfssl/options.h" HINTS ${PC_WOLFSSL_INCLUDE_DIRS} ) find_library(WOLFSSL_LIBRARY - NAMES wolfssl + NAMES "wolfssl" HINTS ${PC_WOLFSSL_LIBRARY_DIRS} ) @@ -37,8 +37,8 @@ find_package_handle_standard_args(wolfssl REQUIRED_VARS VERSION_VAR WOLFSSL_VERSION) if(WOLFSSL_FOUND) - set(WOLFSSL_LIBRARIES ${WOLFSSL_LIBRARY}) - set(WOLFSSL_INCLUDE_DIRS ${WOLFSSL_INCLUDE_DIR}) + set(WOLFSSL_LIBRARIES ${WOLFSSL_LIBRARY}) + set(WOLFSSL_INCLUDE_DIRS ${WOLFSSL_INCLUDE_DIR}) endif() mark_as_advanced(WOLFSSL_INCLUDE_DIR WOLFSSL_LIBRARY)