luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Fix inconsistency regarding mbed TLS include directory

Browse Source 
Previously, one had to set MBEDTLS_INCLUDE_DIR to make CMake find the
headers, but the system complained that mbed TLS wasn't found due to
MBEDTLS_INCLUDE_DIRS (note the trailing s) was not set. This commit
attempts to fix that.

Closes https://github.com/curl/curl/pull/1541
This commit is contained in:
TheAssassin 2017-06-05 01:02:56 +02:00 committed by Jay Satiro
parent bc164de7b3
commit 01596dbadf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -380,7 +380,7 @@ if(CMAKE_USE_MBEDTLS)
set(SSL_ENABLED ON) set(SSL_ENABLED ON)
set(USE_MBEDTLS ON) set(USE_MBEDTLS ON)
list(APPEND CURL_LIBS ${MBEDTLS_LIBRARIES}) list(APPEND CURL_LIBS ${MBEDTLS_LIBRARIES})
include_directories(${MBEDTLS_INCLUDE_DIR}) include_directories(${MBEDTLS_INCLUDE_DIRS})
endif() endif()
option(USE_NGHTTP2 "Use Nghttp2 library" OFF) option(USE_NGHTTP2 "Use Nghttp2 library" OFF)
@ -688,9 +688,9 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT)
endif() endif()
endif() endif()
if(CURL_CA_PATH_SET AND NOT USE_OPENSSL) if(CURL_CA_PATH_SET AND NOT USE_OPENSSL AND NOT USE_MBEDTLS)
message(FATAL_ERROR message(FATAL_ERROR
"CA path only supported by OpenSSL, GnuTLS or PolarSSL. " "CA path only supported by OpenSSL, GnuTLS or mbed TLS. "
"Set CURL_CA_PATH=none or enable one of those TLS backends.") "Set CURL_CA_PATH=none or enable one of those TLS backends.")
endif() endif()