Commit 01596dba authored by TheAssassin's avatar TheAssassin Committed by Jay Satiro
Browse files

cmake: Fix inconsistency regarding mbed TLS include directory 

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
parent bc164de7

CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ if(CMAKE_USE_MBEDTLS) 
  set(SSL_ENABLED ON)

  set(USE_MBEDTLS ON)

  list(APPEND CURL_LIBS ${MBEDTLS_LIBRARIES})

  include_directories(${MBEDTLS_INCLUDE_DIR})

  include_directories(${MBEDTLS_INCLUDE_DIRS})

endif()



option(USE_NGHTTP2 "Use Nghttp2 library" OFF)
@@ -688,9 +688,9 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT) 
    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

            "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.")

endif()