lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2026-01-06 14:21:57 +03:00
Code Activity

cmake: mbedTLS detection tidy-ups

Browse Source 
- set and use `MBEDTLS_INCLUDE_DIRS`.
- stop marking `MBEDTLS_LIBRARIES` as advanced.

Closes #1438
This commit is contained in:
Viktor Szakats
2024-07-30 15:03:40 +02:00
parent 2bb46d4481
commit 6d1d13c2a6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -386,7 +386,7 @@ if(CRYPTO_BACKEND STREQUAL "mbedTLS" OR NOT CRYPTO_BACKEND)
if(MBEDTLS_FOUND)
set(CRYPTO_BACKEND "mbedTLS")
set(CRYPTO_BACKEND_DEFINE "LIBSSH2_MBEDTLS")
set(CRYPTO_BACKEND_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR})
set(CRYPTO_BACKEND_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIRS})
list(APPEND LIBRARIES ${MBEDTLS_LIBRARIES})
list(APPEND LIBSSH2_PC_LIBS_PRIVATE "-lmbedcrypto")
list(APPEND LIBSSH2_PC_REQUIRES_PRIVATE "mbedcrypto")

5
cmake/FindmbedTLS.cmake
View File

@@ -27,8 +27,9 @@ find_package_handle_standard_args(mbedTLS
VERSION_VAR MBEDTLS_VERSION)
if(MBEDTLS_FOUND)
set(MBEDTLS_LIBRARIES "${MBEDCRYPTO_LIBRARY}")
set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
set(MBEDTLS_LIBRARIES ${MBEDCRYPTO_LIBRARY})
message(STATUS "Found mbedTLS libraries: ${MBEDTLS_LIBRARIES}")
endif()
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDCRYPTO_LIBRARY MBEDTLS_LIBRARIES)
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDCRYPTO_LIBRARY)