commit 6d25763d102fe567febb7d43e7b7aaaf1596c95e
author Andy Green <andy@warmcat.com> Mon Aug 28 21:27:55 2017 +0800
committer Andy Green <andy@warmcat.com> Tue Aug 29 08:45:36 2017 +0800
tree eb3a9b83ac70b9d0b7b627b7ae663c55d70dcf3e
parent ec5e0e3e5183abe18687101ae3dfd751fa180df7

esp32: fixes for mbedtls breakout

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d6e14f..72827f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -282,7 +282,7 @@
 endif()
 
 if (LWS_WITH_SSL AND LWS_USE_MBEDTLS)
-	if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "")
+	if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "" AND NOT LWS_WITH_ESP32)
 
 		find_path(LWS_MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h)
 
@@ -302,9 +302,9 @@
 			message(FATAL_ERROR "You must set LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS when LWS_USE_MBEDTLS is turned on.")
 		endif()
 	endif()
-		set(MBEDTLS_LIBRARIES ${LWS_MBEDTLS_LIBRARIES})
-		set(MBEDTLS_INCLUDE_DIRS ${LWS_MBEDTLS_INCLUDE_DIRS})
-		set(MBEDTLS_FOUND 1)
+	set(MBEDTLS_LIBRARIES ${LWS_MBEDTLS_LIBRARIES})
+	set(MBEDTLS_INCLUDE_DIRS ${LWS_MBEDTLS_INCLUDE_DIRS})
+	set(MBEDTLS_FOUND 1)
 	set(USE_MBEDTLS 1)
 endif()
 
@@ -608,7 +608,7 @@
 		lib/client-parser.c)
 endif()
 
-if (LWS_USE_MBEDTLS)
+if (LWS_USE_MBEDTLS AND NOT LWS_WITH_ESP32)
  	set(LWS_WITH_SSL ON)
 
 	list(APPEND HDR_PRIVATE