diff options
| author | Etienne Samson <samson.etienne@gmail.com> | 2018-05-25 09:28:52 +0000 |
|---|---|---|
| committer | Etienne Samson <samson.etienne@gmail.com> | 2018-05-25 14:38:44 +0200 |
| commit | 64a78a80fc2e3dd0d94fbc248202bb676075f78a (patch) | |
| tree | 8bd155737e42909b3ed104761c72435cfad89ad7 | |
| parent | f9cf9a04ba61cba7b1112764dd25c0e4638bed75 (diff) | |
| download | libgit2-64a78a80fc2e3dd0d94fbc248202bb676075f78a.tar.gz | |
mbedtls: don't require mbedtls from our pkgconfig file
mbedTLS has no pkgconfig file, hence we can't require it. For now, pass its link flags as our own.
| -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() |