From https://gitlab.com/libssh/libssh-mirror/-/commit/7712c7d0f97241c68e520d600b5857ebfcfd7439 From: Davidwed Date: Tue, 3 Sep 2024 11:43:32 +0200 Subject: [PATCH] cmake: Fixed compatibility issues with "CPM.cmake" in combination with the libraries MBedTLS and libgcrypt. Signed-off-by: Davidwed Reviewed-by: Jakub Jelen --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ set(LIBSSH_PUBLIC_INCLUDE_DIRS ${libssh_SOURCE_DIR}/include) set(LIBSSH_PRIVATE_INCLUDE_DIRS + ${libssh_BINARY_DIR}/include ${libssh_BINARY_DIR} ) @@ -12,27 +13,13 @@ if (TARGET OpenSSL::Crypto) list(APPEND LIBSSH_LINK_LIBRARIES OpenSSL::Crypto) endif () -if (MBEDTLS_CRYPTO_LIBRARY) - set(LIBSSH_PRIVATE_INCLUDE_DIRS - ${LIBSSH_PRIVATE_INCLUDE_DIRS} - ${MBEDTLS_INCLUDE_DIR} - ) - set(LIBSSH_LINK_LIBRARIES - ${LIBSSH_LINK_LIBRARIES} - ${MBEDTLS_CRYPTO_LIBRARY} - ) -endif (MBEDTLS_CRYPTO_LIBRARY) - -if (GCRYPT_LIBRARIES) - set(LIBSSH_PRIVATE_INCLUDE_DIRS - ${LIBSSH_PRIVATE_INCLUDE_DIRS} - ${GCRYPT_INCLUDE_DIR} - ) +if (TARGET MbedTLS::mbedcrypto) + list(APPEND LIBSSH_LINK_LIBRARIES MbedTLS::mbedcrypto) +endif () - set(LIBSSH_LINK_LIBRARIES - ${LIBSSH_LINK_LIBRARIES} - ${GCRYPT_LIBRARIES}) -endif() +if (TARGET libgcrypt::libgcrypt) + list(APPEND LIBSSH_LINK_LIBRARIES ${GCRYPT_LIBRARIES}) +endif () if (WITH_ZLIB) list(APPEND LIBSSH_LINK_LIBRARIES ZLIB::ZLIB) -- GitLab