diff options
| author | Patrick Steinhardt <ps@pks.im> | 2018-06-15 11:34:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 11:34:04 +0200 |
| commit | 678fa45b60202f64ad0fbc674d37ca56388981ae (patch) | |
| tree | a33d25b1b841cf25b3faa789baa11e2879ce955b /src | |
| parent | c103616feaebf119386514e0f138bea551baf3ae (diff) | |
| parent | 82849b96e2d444005f7fba8c5d24ff9922dfb61c (diff) | |
| download | libgit2-678fa45b60202f64ad0fbc674d37ca56388981ae.tar.gz | |
Merge pull request #4678 from staticfloat/sf/mbedtls_linkage
Link `mbedTLS` libraries in when `SHA1_BACKEND` == "mbedTLS"
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b82bb325..2deed5f87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -284,8 +284,13 @@ ELSEIF(SHA1_BACKEND STREQUAL "CommonCrypto") ELSEIF (SHA1_BACKEND STREQUAL "mbedTLS") ADD_FEATURE_INFO(SHA ON "using mbedTLS") SET(GIT_SHA1_MBEDTLS 1) - FILE(GLOB SRC_SHA1 src/hash/hash_mbedtls.c) - LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls") + FILE(GLOB SRC_SHA1 hash/hash_mbedtls.c) + LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR}) + LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES}) + # mbedTLS has no pkgconfig file, hence we can't require it + # https://github.com/ARMmbed/mbedtls/issues/228 + # For now, pass its link flags as our own + LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LIBRARIES}) ELSE() MESSAGE(FATAL_ERROR "Asked for unknown SHA1 backend ${SHA1_BACKEND}") ENDIF() |