Lab
/
libuhttpd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #13 from ffontaine/master 

src/CMakeLists.txt: fix static build with a zlib and mbedtls
main
Jianhui Zhao 2020-12-02 13:11:08 +08:00 committed by GitHub
parent 92b6cd4d3b 0c2d85450e
commit 2c0cedc2bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -57,6 +57,7 @@ else()
endif() endif()
find_package(WolfSSL) find_package(WolfSSL)
find_package(MbedTLS) find_package(MbedTLS)
find_package(ZLIB)
if(UHTTPD_USE_OPENSSL) if(UHTTPD_USE_OPENSSL)
if (NOT OPENSSL_FOUND) if (NOT OPENSSL_FOUND)
@ -97,7 +98,11 @@ else()
elseif(UHTTPD_USE_MBEDTLS) elseif(UHTTPD_USE_MBEDTLS)
set(SSL_NAME "MbedTLS(PolarSSL)") set(SSL_NAME "MbedTLS(PolarSSL)")
set(SSL_INC ${MBEDTLS_INCLUDE_DIR}) set(SSL_INC ${MBEDTLS_INCLUDE_DIR})
set(SSL_LIB ${MBEDTLS_LIBRARIES}) if(ZLIB_FOUND)
set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
else()
set(SSL_LIB ${MBEDTLS_LIBRARIES})
endif()
set(UHTTPD_HAVE_MBEDTLS_CONFIG 1) set(UHTTPD_HAVE_MBEDTLS_CONFIG 1)
endif() endif()