diff options
| author | Patrick Steinhardt <ps@pks.im> | 2018-05-30 08:25:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 08:25:19 +0200 |
| commit | 36ae5c9330cf2ba22c3c6075752605a712755b60 (patch) | |
| tree | b9165db50ff243146e97cb8c05dc5f70cfc6cbf2 /src | |
| parent | 7f6c1ce9760c6c397e94d4eba506faeb95452702 (diff) | |
| parent | 64a78a80fc2e3dd0d94fbc248202bb676075f78a (diff) | |
| download | libgit2-36ae5c9330cf2ba22c3c6075752605a712755b60.tar.gz | |
Merge pull request #4656 from tiennou/fix/mbedtls-no-pkgconfig
mbedtls: don't require mbedtls from our pkgconfig file
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d447ac571..2b82bb325 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -232,8 +232,10 @@ IF (USE_HTTPS) SET(GIT_MBEDTLS 1) LIST(APPEND LIBGIT2_INCLUDES ${MBEDTLS_INCLUDE_DIR}) LIST(APPEND LIBGIT2_LIBS ${MBEDTLS_LIBRARIES}) - LIST(APPEND LIBGIT2_PC_LIBS ${MBEDTLS_LDFLAGS}) - LIST(APPEND LIBGIT2_PC_REQUIRES "mbedtls") + # 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}) ELSEIF (HTTPS_BACKEND STREQUAL "WinHTTP") # WinHTTP setup was handled in the WinHTTP-specific block above ELSE() |