mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

cmake: link against libmbedcrypto if available 

In recent versions of mbed TLS, several symbols are moved to
libmbedcrypto.

Fixes: https://github.com/transmission/transmission/issues/115
This commit is contained in:
Mike Gilbert 2016-12-18 14:20:30 -05:00
parent 9d562ab25a
commit 530eca541b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindPolarSSL.cmake
View File

@ -14,9 +14,14 @@ endif()
find_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/version.h HINTS ${_MBEDTLS_INCLUDEDIR})
find_library(MBEDTLS_LIBRARY NAMES mbedtls HINTS ${_MBEDTLS_LIBDIR})
find_library(MBEDCRYPTO_LIBRARY NAMES mbedcrypto HINTS ${_MBEDTLS_LIBDIR})
if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY)
set(POLARSSL_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR})
set(POLARSSL_LIBRARY ${MBEDTLS_LIBRARY})
if(MBEDCRYPTO_LIBRARY)
set(POLARSSL_LIBRARY ${MBEDTLS_LIBRARY} ${MBEDCRYPTO_LIBRARY})
else()
set(POLARSSL_LIBRARY ${MBEDTLS_LIBRARY})
endif()
set(POLARSSL_VERSION ${_MBEDTLS_VERSION})
set(POLARSSL_IS_MBEDTLS ON)
else()
@ -54,7 +59,7 @@ find_package_handle_standard_args(PolarSSL
POLARSSL_VERSION
)
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDCRYPTO_LIBRARY POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
if(POLARSSL_PREFER_STATIC_LIB)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${POLARSSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})