From 570de0f23fcc4ad8467384329202d9e6fccea79a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 18 Aug 2024 12:56:13 +0200 Subject: [PATCH] cmake: rename mbedTLS and wolfSSL Find modules To match the curl ones. Cherry-picked from #1445 --- CMakeLists.txt | 4 ++-- cmake/{FindmbedTLS.cmake => FindMbedTLS.cmake} | 2 +- cmake/{Findwolfssl.cmake => FindWolfSSL.cmake} | 2 +- cmake/libssh2-config.cmake.in | 4 ++-- src/CMakeLists.txt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename cmake/{FindmbedTLS.cmake => FindMbedTLS.cmake} (97%) rename cmake/{Findwolfssl.cmake => FindWolfSSL.cmake} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5911ff2..f1fa07f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,7 +340,7 @@ endif() if(CRYPTO_BACKEND STREQUAL "wolfSSL" OR NOT CRYPTO_BACKEND) - find_package(wolfssl ${SPECIFIC_CRYPTO_REQUIREMENT}) + find_package(WolfSSL ${SPECIFIC_CRYPTO_REQUIREMENT}) if(WOLFSSL_FOUND) set(CRYPTO_BACKEND "wolfSSL") @@ -381,7 +381,7 @@ endif() if(CRYPTO_BACKEND STREQUAL "mbedTLS" OR NOT CRYPTO_BACKEND) - find_package(mbedTLS ${SPECIFIC_CRYPTO_REQUIREMENT}) + find_package(MbedTLS ${SPECIFIC_CRYPTO_REQUIREMENT}) if(MBEDTLS_FOUND) set(CRYPTO_BACKEND "mbedTLS") diff --git a/cmake/FindmbedTLS.cmake b/cmake/FindMbedTLS.cmake similarity index 97% rename from cmake/FindmbedTLS.cmake rename to cmake/FindMbedTLS.cmake index 27397302..376bd83d 100644 --- a/cmake/FindmbedTLS.cmake +++ b/cmake/FindMbedTLS.cmake @@ -28,7 +28,7 @@ if(MBEDTLS_INCLUDE_DIR) endif() include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(mbedTLS +find_package_handle_standard_args(MbedTLS REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDCRYPTO_LIBRARY VERSION_VAR MBEDTLS_VERSION) diff --git a/cmake/Findwolfssl.cmake b/cmake/FindWolfSSL.cmake similarity index 97% rename from cmake/Findwolfssl.cmake rename to cmake/FindWolfSSL.cmake index f6ae8362..c7c84fe0 100644 --- a/cmake/Findwolfssl.cmake +++ b/cmake/FindWolfSSL.cmake @@ -32,7 +32,7 @@ include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set WOLFSSL_FOUND # to TRUE if all listed variables are TRUE and the requested version # matches. -find_package_handle_standard_args(wolfssl +find_package_handle_standard_args(WolfSSL REQUIRED_VARS WOLFSSL_INCLUDE_DIR WOLFSSL_LIBRARY VERSION_VAR WOLFSSL_VERSION) diff --git a/cmake/libssh2-config.cmake.in b/cmake/libssh2-config.cmake.in index 3cd37dfb..04bb618a 100644 --- a/cmake/libssh2-config.cmake.in +++ b/cmake/libssh2-config.cmake.in @@ -7,11 +7,11 @@ list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) if("@CRYPTO_BACKEND@" STREQUAL "OpenSSL") find_dependency(OpenSSL) elseif("@CRYPTO_BACKEND@" STREQUAL "wolfSSL") - find_package(wolfssl) + find_package(WolfSSL) elseif("@CRYPTO_BACKEND@" STREQUAL "Libgcrypt") find_package(Libgcrypt) elseif("@CRYPTO_BACKEND@" STREQUAL "mbedTLS") - find_package(mbedTLS) + find_package(MbedTLS) endif() if(@ZLIB_FOUND@) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8ca0193..55928545 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -191,8 +191,8 @@ install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" "${PROJECT_SOURCE_DIR}/cmake/FindLibgcrypt.cmake" - "${PROJECT_SOURCE_DIR}/cmake/FindmbedTLS.cmake" - "${PROJECT_SOURCE_DIR}/cmake/Findwolfssl.cmake" + "${PROJECT_SOURCE_DIR}/cmake/FindMbedTLS.cmake" + "${PROJECT_SOURCE_DIR}/cmake/FindWolfSSL.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") ## Export a .pc file for client projects not using CMake