Upgrade to 3.2.0
[platform/upstream/libwebsockets.git] / CMakeLists.txt
index 5ba8c1a..491531a 100644 (file)
 cmake_minimum_required(VERSION 2.8.9)
 
+# General Advice
+#
+# For selecting between DEBUG / RELEASE, use -DCMAKE_BUILD_TYPE=DEBUG or =RELEASE
+#   debug builds include source level debug info and extra logging
+
+set(LWS_WITH_BUNDLED_ZLIB_DEFAULT OFF)
+if(WIN32)
+       set(LWS_WITH_BUNDLED_ZLIB_DEFAULT ON)
+endif()
+
+set(LWS_ROLE_RAW 1)
+set(LWS_WITH_POLL 1)
+
+#
+# Select features recommended for PC distro packaging
+#
+option(LWS_WITH_DISTRO_RECOMMENDED "Enable features recommended for distro packaging" OFF)
+option(LWS_FOR_GITOHASHI "Enable features recommended for use with gitohashi" OFF)
+
+#
+# Major individual features
+#
+option(LWS_WITH_NETWORK "Compile with network-related code" ON)
+option(LWS_ROLE_H1 "Compile with support for http/1 (needed for ws)" ON)
+option(LWS_ROLE_WS "Compile with support for websockets" ON)
+option(LWS_ROLE_DBUS "Compile with support for DBUS" OFF)
+option(LWS_ROLE_RAW_PROXY "Raw packet proxy" OFF)
+option(LWS_WITH_HTTP2 "Compile with server support for HTTP/2" ON)
+option(LWS_WITH_LWSWS "Libwebsockets Webserver" OFF)
+option(LWS_WITH_CGI "Include CGI (spawn process with network-connected stdin/out/err) APIs" OFF)
+option(LWS_IPV6 "Compile with support for ipv6" OFF)
+option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket" OFF)
+option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions" OFF)
+option(LWS_WITH_HTTP_PROXY "Support for HTTP proxying" OFF)
+option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" OFF)
+option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF)
+option(LWS_WITH_GENERIC_SESSIONS "With the Generic Sessions plugin" OFF)
+option(LWS_WITH_PEER_LIMITS "Track peers and restrict resources a single peer can allocate" OFF)
+option(LWS_WITH_ACCESS_LOG "Support generating Apache-compatible access logs" OFF)
+option(LWS_WITH_RANGES "Support http ranges (RFC7233)" OFF)
+option(LWS_WITH_SERVER_STATUS "Support json + jscript server monitoring" OFF)
+option(LWS_WITH_THREADPOOL "Managed worker thread pool support (relies on pthreads)" OFF)
+option(LWS_WITH_HTTP_STREAM_COMPRESSION "Support HTTP stream compression" OFF)
+option(LWS_WITH_HTTP_BROTLI "Also offer brotli http stream compression (requires LWS_WITH_HTTP_STREAM_COMPRESSION)" OFF)
+option(LWS_WITH_ACME "Enable support for ACME automatic cert acquisition + maintenance (letsencrypt etc)" OFF)
+option(LWS_WITH_HUBBUB "Enable libhubbub rewriting support" OFF)
+option(LWS_WITH_FTS "Full Text Search support" OFF)
+#
+# TLS library options... all except mbedTLS are basically OpenSSL variants.
+#
+option(LWS_WITH_SSL "Include SSL support (defaults to OpenSSL or similar, mbedTLS if LWS_WITH_MBEDTLS is set)" ON)
+option(LWS_WITH_MBEDTLS "Use mbedTLS (>=2.0) replacement for OpenSSL. When setting this, you also may need to specify LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS" OFF)
+option(LWS_WITH_BORINGSSL "Use BoringSSL replacement for OpenSSL" OFF)
+option(LWS_WITH_CYASSL "Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF)
+option(LWS_WITH_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF)
+option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of the OS-installed CA root certs" ON)
+#
+# Event library options (may select multiple, or none for default poll()
+#
+option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
+option(LWS_WITH_LIBUV "Compile with support for libuv" OFF)
+option(LWS_WITH_LIBEVENT "Compile with support for libevent" OFF)
+#
+# Static / Dynamic build options
+#
+option(LWS_WITH_STATIC "Build the static version of the library" ON)
+option(LWS_WITH_SHARED "Build the shared version of the library" ON)
+option(LWS_LINK_TESTAPPS_DYNAMIC "Link the test apps to the shared version of the library. Default is to link statically" OFF)
+option(LWS_STATIC_PIC "Build the static version of the library with position-independent code" OFF)
+#
+# Specific platforms
+#
+option(LWS_WITH_ESP32 "Build for ESP32" OFF)
+option(LWS_WITH_ESP32_HELPER "Build ESP32 helper" OFF)
+option(LWS_PLAT_OPTEE "Build for OPTEE" OFF)
+#
+# Client / Server / Test Apps build control
+#
+option(LWS_WITHOUT_CLIENT "Don't build the client part of the library" OFF)
+option(LWS_WITHOUT_SERVER "Don't build the server part of the library" OFF)
+option(LWS_WITHOUT_TESTAPPS "Don't build the libwebsocket-test-apps" OFF)
+option(LWS_WITHOUT_TEST_SERVER "Don't build the test server" OFF)
+option(LWS_WITHOUT_TEST_SERVER_EXTPOLL "Don't build the test server version that uses external poll" OFF)
+option(LWS_WITHOUT_TEST_PING "Don't build the ping test application" OFF)
+option(LWS_WITHOUT_TEST_CLIENT "Don't build the client test application" OFF)
+#
+# Extensions (permessage-deflate)
+#
+option(LWS_WITHOUT_EXTENSIONS "Don't compile with extensions" ON)
+#
+# Helpers + misc
+#
+option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use the BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... The default is to assume that your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
+option(LWS_FALLBACK_GETHOSTBYNAME "Also try to do dns resolution using gethostbyname if getaddrinfo fails" OFF)
+option(LWS_WITHOUT_BUILTIN_SHA1 "Don't build the lws sha-1 (eg, because openssl will provide it" OFF)
+option(LWS_WITH_LATENCY "Build latency measuring code into the library" OFF)
+option(LWS_WITHOUT_DAEMONIZE "Don't build the daemonization api" ON)
+option(LWS_SSL_SERVER_WITH_ECDH_CERT "Include SSL server use ECDH certificate" OFF)
+option(LWS_WITH_LEJP "With the Lightweight JSON Parser" ON)
+option(LWS_WITH_SQLITE3 "Require SQLITE3 support" OFF)
+option(LWS_WITH_STRUCT_JSON "Generic struct serialization to and from JSON" ON)
+option(LWS_WITH_STRUCT_SQLITE3 "Generic struct serialization to and from SQLITE3" OFF)
+option(LWS_WITH_SMTP "Provide SMTP support" OFF)
+if (WIN32 OR LWS_WITH_ESP32)
+option(LWS_WITH_DIR "Directory scanning api support" OFF)
+option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF)
+else()
+option(LWS_WITH_DIR "Directory scanning api support" ON)
+option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" ON)
+endif()
+option(LWS_WITH_NO_LOGS "Disable all logging from being compiled in" OFF)
+option(LWS_AVOID_SIGPIPE_IGN "Android 7+ reportedly needs this" OFF)
+option(LWS_WITH_STATS "Keep statistics of lws internal operations" OFF)
+option(LWS_WITH_JOSE "JSON Web Signature / Encryption / Keys (RFC7515/6/) API" OFF)
+option(LWS_WITH_GENCRYPTO "Enable support for Generic Crypto apis independent of TLS backend" OFF)
+option(LWS_WITH_SELFTESTS "Selftests run at context creation" OFF)
+option(LWS_WITH_GCOV "Build with gcc gcov coverage instrumentation" OFF)
+option(LWS_WITH_EXPORT_LWSTARGETS "Export libwebsockets CMake targets.  Disable if they conflict with an outer cmake project." ON)
+option(LWS_REPRODUCIBLE "Build libwebsockets reproducible. It removes the build user and hostname from the build" ON)
+option(LWS_WITH_MINIMAL_EXAMPLES "Also build the normally standalone minimal examples, for QA" OFF)
+option(LWS_WITH_LWSAC "lwsac Chunk Allocation api" ON)
+option(LWS_WITH_CUSTOM_HEADERS "Store and allow querying custom HTTP headers (H1 only)" ON)
+option(LWS_WITH_DISKCACHE "Hashed cache directory with lazy LRU deletion to size limit" OFF)
+option(LWS_WITH_ASAN "Build with gcc runtime sanitizer options enabled (needs libasan)" OFF)
+option(LWS_WITH_DIR "Directory scanning api support" OFF)
+option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF)
+option(LWS_WITH_ZLIB "Include zlib support (required for extensions)" OFF)
+option(LWS_WITH_BUNDLED_ZLIB "Use bundled zlib version (Windows only)" ${LWS_WITH_BUNDLED_ZLIB_DEFAULT})
+option(LWS_WITH_MINIZ "Use miniz instead of zlib" OFF)
+option(LWS_WITH_DEPRECATED_LWS_DLL "Migrate to lws_dll2 instead ASAP" OFF)
+option(LWS_WITH_SEQUENCER "lws_seq_t support" ON)
+option(LWS_WITH_EXTERNAL_POLL "Support external POLL integration using callback messages (not recommended)" OFF)
+option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF)
+#
+# to use miniz, enable both LWS_WITH_ZLIB and LWS_WITH_MINIZ
+#
+# End of user settings
+#
+
+# Workaround for ESP-IDF
+# Detect ESP_PLATFORM environment flag, if exist, set LWS_WITH_ESP32.
+# Otherwise the user may not be able to run configuration ESP-IDF in the first time.
+if(ESP_PLATFORM)
+       message(STATUS "ESP-IDF enabled")
+       set(LWS_WITH_ESP32 ON)
+else()
+       set(LWS_WITH_ESP32_HELPER OFF)
+endif()
+
+if (WIN32 OR LWS_WITH_ESP32)
+       message(STATUS "No LWS_WITH_DIR and LWS_WITH_DIR")
+       set(LWS_WITH_DIR OFF)
+       set(LWS_WITH_LEJP_CONF OFF)
+       message("LWS_WITH_DIR ${LWS_WITH_DIR}")
+else()
+       message(STATUS "Compiled with LWS_WITH_DIR and LWS_WITH_DIR")
+       set(LWS_WITH_DIR ON)
+       set(LWS_WITH_LEJP_CONF ON)
+endif()
+
+if (LWS_FOR_GITOHASHI)
+       set(LWS_WITH_THREADPOOL 1)
+       set(LWS_WITH_HTTP2 1)
+       set(LWS_UNIX_SOCK 1)
+       set(LWS_WITH_HTTP_PROXY 1)
+       set(LWS_WITH_FTS 1)
+       set(LWS_WITH_DISKCACHE 1)
+       set(LWS_WITH_LWSAC 1)
+       set(LWS_WITH_LEJP_CONF 1)
+endif()
+
+if(LWS_WITH_DISTRO_RECOMMENDED)
+       set(LWS_WITH_HTTP2 1)
+       set(LWS_WITH_LWSWS 1)
+       set(LWS_WITH_CGI 1)
+       set(LWS_IPV6 1)
+       set(LWS_WITH_ZIP_FOPS 1)
+       set(LWS_WITH_SOCKS5 1)
+       set(LWS_WITH_RANGES 1)
+       set(LWS_WITH_ACME 1)
+       set(LWS_WITH_SERVER_STATUS 1)
+       set(LWS_WITH_LIBUV 1)
+       set(LWS_WITH_LIBEV 1)
+       # libev + libevent cannot coexist at build-time
+       set(LWS_WITH_LIBEVENT 0)
+       set(LWS_WITHOUT_EXTENSIONS 0)
+       set(LWS_ROLE_DBUS 1)
+       set(LWS_WITH_FTS 1)
+       set(LWS_WITH_THREADPOOL 1)
+       set(LWS_UNIX_SOCK 1)
+       set(LWS_WITH_HTTP_PROXY 1)
+       set(LWS_WITH_DISKCACHE 1)
+       set(LWS_WITH_LWSAC 1)
+       set(LWS_WITH_LEJP_CONF 1)
+       set(LWS_WITH_PLUGINS 1)
+       set(LWS_ROLE_RAW_PROXY 1)
+       set(LWS_WITH_GENCRYPTO 1)
+       set(LWS_WITH_JOSE 1)
+endif()
+
+if (NOT LWS_WITH_NETWORK)
+       set(LWS_ROLE_H1 0)
+       set(LWS_ROLE_WS 0)
+       set(LWS_ROLE_RAW 0)
+       set(LWS_WITHOUT_EXTENSIONS 1)
+       set(LWS_WITHOUT_SERVER 1)
+       set(LWS_WITHOUT_CLIENT 1)
+       set(LWS_WITH_HTTP2 0)
+       set(LWS_WITH_SOCKS5 0)
+       set(LWS_UNIX_SOCK 0)
+       set(LWS_WITH_HTTP_PROXY 0)
+       set(LWS_WITH_PLUGINS 0)
+       set(LWS_WITH_LWSWS 0)
+       set(LWS_WITH_CGI 0)
+       set(LWS_ROLE_RAW_PROXY 0)
+       set(LWS_WITH_PEER_LIMITS 0)
+       set(LWS_WITH_GENERIC_SESSIONS 0)
+       set(LWS_WITH_HTTP_STREAM_COMPRESSION 0)
+       set(LWS_WITH_HTTP_BROTLI 0)
+       set(LWS_WITH_POLL 0)
+       set(LWS_WITH_SEQUENCER 0)
+       set(LWS_ROLE_DBUS 0)
+       set(LWS_WITH_LWS_DSH 0)
+endif()
+
+if (LWS_WITH_STRUCT_SQLITE3)
+       set(LWS_WITH_SQLITE3 1)
+endif()
+
+# do you care about this?  Then send me a patch where it disables it on travis
+# but allows it on APPLE
+if (APPLE)
+       set(LWS_ROLE_DBUS 0)
+endif()
+
 if(NOT DEFINED CMAKE_BUILD_TYPE)
        set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
 endif()
 
+# microsoft... that's why you can't have nice things
+
+if (WIN32 OR LWS_WITH_ESP32)
+       set(LWS_UNIX_SOCK 0)
+endif()
+
+if (LWS_WITH_ESP32)
+       set(LWS_WITH_LWSAC 0)
+       set(LWS_WITH_FTS 0)
+endif()
+
 project(libwebsockets C)
 
 set(PACKAGE "libwebsockets")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
-set(CPACK_PACKAGE_VERSION_MAJOR "2")
-set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_MAJOR "3")
+set(CPACK_PACKAGE_VERSION_MINOR "2")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_RELEASE 1)
+set(CPACK_GENERATOR "RPM")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
+set(CPACK_PACKAGE_CONTACT "andy@warmcat.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "11")
+set(SOVERSION "15")
 if(NOT CPACK_GENERATOR)
     if(UNIX)
         set(CPACK_GENERATOR "TGZ")
@@ -33,92 +282,64 @@ set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 
+
 message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'")
 
+if(WIN32)
+       configure_file(${CMAKE_CURRENT_SOURCE_DIR}/win32port/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/win32port/version.rc @ONLY)
+       set(RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/win32port/version.rc)
+endif()
+
 # Try to find the current Git hash.
 find_package(Git)
 if(GIT_EXECUTABLE)
        execute_process(
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMAND "${GIT_EXECUTABLE}" describe
-    OUTPUT_VARIABLE GIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-       execute_process(
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMAND "whoami"
-    OUTPUT_VARIABLE GIT_USER
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-       execute_process(
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMAND "hostname"
-    OUTPUT_VARIABLE GIT_HOST
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-       string(REGEX REPLACE "([^\\])[\\]([^\\])" "\\1\\\\\\\\\\2" GIT_USER ${GIT_USER})
-    set(LWS_BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH})
-    message("Git commit hash: ${LWS_BUILD_HASH}")
+               WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+               COMMAND "${GIT_EXECUTABLE}" describe --tags
+               OUTPUT_VARIABLE GIT_HASH
+               OUTPUT_STRIP_TRAILING_WHITESPACE
+               )
+       set(LWS_BUILD_HASH ${GIT_HASH})
+
+       # append the build user and hostname
+       if(NOT LWS_REPRODUCIBLE)
+               execute_process(
+                       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                       COMMAND "whoami"
+                       OUTPUT_VARIABLE GIT_USER
+                       OUTPUT_STRIP_TRAILING_WHITESPACE
+                       )
+               execute_process(
+                       WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                       COMMAND "hostname"
+                       OUTPUT_VARIABLE GIT_HOST
+                       OUTPUT_STRIP_TRAILING_WHITESPACE
+                       )
+               string(REGEX REPLACE "([^\\])[\\]([^\\])" "\\1\\\\\\\\\\2" GIT_USER ${GIT_USER})
+               set(LWS_BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH})
+       endif()
+
+       message("Git commit hash: ${LWS_BUILD_HASH}")
 endif()
 
-set(LWS_USE_BUNDLED_ZLIB_DEFAULT OFF)
-if(WIN32)
-       set(LWS_USE_BUNDLED_ZLIB_DEFAULT ON)
+# translate old functionality enables to set up ROLE enables so nothing changes
+if (LWS_WITH_HTTP2 AND LWS_WITHOUT_SERVER)
+       set(LWS_WITH_HTTP2 0)
+       message("HTTP2 disabled due to LWS_WITHOUT_SERVER")
 endif()
 
-option(LWS_WITH_STATIC "Build the static version of the library" ON)
-option(LWS_WITH_SHARED "Build the shared version of the library" ON)
-option(LWS_WITH_SSL "Include SSL support (default OpenSSL, wolfSSL if LWS_USE_WOLFSSL is set)" ON)
-option(LWS_USE_BORINGSSL "Use BoringSSL replacement for OpenSSL" OFF)
-option(LWS_USE_CYASSL "Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF)
-option(LWS_USE_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF)
-option(LWS_WITH_ZLIB "Include zlib support (required for extensions)" ON)
-option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
-option(LWS_WITH_LIBUV "Compile with support for libuv" OFF)
-option(LWS_WITH_LIBEVENT "Compile with support for libevent" OFF)
-option(LWS_USE_BUNDLED_ZLIB "Use bundled zlib version (Windows only)" ${LWS_USE_BUNDLED_ZLIB_DEFAULT})
-option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of the OS-installed CA root certs" ON)
-option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use the BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... The default is to assume that your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
-option(LWS_WITHOUT_BUILTIN_SHA1 "Don't build the lws sha-1 (eg, because openssl will provide it" OFF)
-option(LWS_WITHOUT_CLIENT "Don't build the client part of the library" OFF)
-option(LWS_WITHOUT_SERVER "Don't build the server part of the library" OFF)
-option(LWS_LINK_TESTAPPS_DYNAMIC "Link the test apps to the shared version of the library. Default is to link statically" OFF)
-option(LWS_WITHOUT_TESTAPPS "Don't build the libwebsocket-test-apps" OFF)
-option(LWS_WITHOUT_TEST_SERVER "Don't build the test server" OFF)
-option(LWS_WITHOUT_TEST_SERVER_EXTPOLL "Don't build the test server version that uses external poll" OFF)
-option(LWS_WITHOUT_TEST_PING "Don't build the ping test application" OFF)
-option(LWS_WITHOUT_TEST_ECHO "Don't build the echo test application" OFF)
-option(LWS_WITHOUT_TEST_CLIENT "Don't build the client test application" OFF)
-option(LWS_WITHOUT_TEST_FRAGGLE "Don't build the ping test application" OFF)
-option(LWS_WITHOUT_EXTENSIONS "Don't compile with extensions" OFF)
-option(LWS_WITH_LATENCY "Build latency measuring code into the library" OFF)
-option(LWS_WITHOUT_DAEMONIZE "Don't build the daemonization api" ON)
-option(LWS_IPV6 "Compile with support for ipv6" OFF)
-option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket" OFF)
-#option(LWS_WITH_HTTP2 "Compile with support for http2" OFF)
-option(LWS_SSL_SERVER_WITH_ECDH_CERT "Include SSL server use ECDH certificate" OFF)
-option(LWS_WITH_CGI "Include CGI (spawn process with network-connected stdin/out/err) APIs" OFF)
-option(LWS_WITH_HTTP_PROXY "Support for rewriting HTTP proxying (requires libhubbub)" OFF)
-option(LWS_WITH_LWSWS "Libwebsockets Webserver" OFF)
-option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions" OFF)
-option(LWS_WITH_ACCESS_LOG "Support generating Apache-compatible access logs" OFF)
-option(LWS_WITH_SERVER_STATUS "Support json + jscript server monitoring" OFF)
-option(LWS_WITH_LEJP "With the Lightweight JSON Parser" OFF)
-option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF)
-option(LWS_WITH_GENERIC_SESSIONS "With the Generic Sessions plugin" OFF)
-option(LWS_WITH_SQLITE3 "Require SQLITE3 support" OFF)
-option(LWS_WITH_SMTP "Provide SMTP support" OFF)
-option(LWS_WITH_ESP8266 "Build for ESP8266" OFF)
-option(LWS_WITH_ESP32 "Build for ESP32" OFF)
-option(LWS_PLAT_OPTEE "Build for OPTEE" OFF)
-option(LWS_WITH_NO_LOGS "Disable all logging from being compiled in" OFF)
-option(LWS_STATIC_PIC "Build the static version of the library with position-independent code" OFF)
-option(LWS_WITH_RANGES "Support http ranges (RFC7233)" ON)
-option(LWS_FALLBACK_GETHOSTBYNAME "Also try to do dns resolution using gethostbyname if getaddrinfo fails" OFF)
-option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" ON)
-option(LWS_AVOID_SIGPIPE_IGN "Android 7+ seems to need this" OFF)
-option(LWS_WITH_STATS "Keep statistics of lws internal operations" OFF)
-option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF)
+if (LWS_WITH_HTTP2)
+       set(LWS_ROLE_H2 1)
+endif()
+if (LWS_WITH_CGI)
+       set(LWS_ROLE_CGI 1)
+endif()
+
+if (NOT LWS_ROLE_WS)
+       set(LWS_WITHOUT_EXTENSIONS 1)
+endif()
+
+include_directories(include plugins)
 
 if (LWS_WITH_LWSWS)
  message(STATUS "LWS_WITH_LWSWS --> Enabling LWS_WITH_PLUGINS and LWS_WITH_LIBUV")
@@ -128,6 +349,29 @@ if (LWS_WITH_LWSWS)
  set(LWS_WITH_SERVER_STATUS 1)
  set(LWS_WITH_LEJP 1)
  set(LWS_WITH_LEJP_CONF 1)
+ set(LWS_WITH_PEER_LIMITS 1)
+ set(LWS_ROLE_RAW_PROXY 1)
+endif()
+
+# sshd plugin
+if (LWS_WITH_PLUGINS)
+ set(LWS_WITH_GENCRYPTO 1)
+endif()
+
+if (LWS_ROLE_RAW_PROXY)
+ set (LWS_WITHOUT_CLIENT 0)
+ set (LWS_WITHOUT_SERVER 0)
+endif()
+
+if (LWS_WITH_ACME)
+ set (LWS_WITHOUT_CLIENT 0)
+ set (LWS_WITHOUT_SERVER 0)
+ set (LWS_WITH_JOSE 1)
+endif()
+
+if (LWS_WITH_JOSE)
+ set(LWS_WITH_LEJP 1)
+ set(LWS_WITH_GENCRYPTO 1)
 endif()
 
 if (LWS_WITH_PLUGINS AND NOT LWS_WITH_LIBUV)
@@ -135,41 +379,20 @@ message(STATUS "LWS_WITH_PLUGINS --> Enabling LWS_WITH_LIBUV")
  set(LWS_WITH_LIBUV 1)
 endif()
 
-if (LWS_WITH_SMTP AND NOT LWS_WITH_LIBUV)
-message(STATUS "LWS_WITH_SMTP --> Enabling LWS_WITH_LIBUV")
- set(LWS_WITH_LIBUV 1)
+if (LWS_WITH_PLUGINS OR LWS_WITH_CGI)
+       # sshd plugin
+ set(LWS_WITH_GENCRYPTO 1)
 endif()
 
 if (LWS_WITH_GENERIC_SESSIONS)
  set(LWS_WITH_SQLITE3 1)
  set(LWS_WITH_SMTP 1)
-endif()
-
-if (LWS_WITH_SMTP AND NOT LWS_WITH_LIBUV)
-message(STATUS "LWS_WITH_SMTP --> Enabling LWS_WITH_LIBUV")
- set(LWS_WITH_LIBUV 1)
-endif()
-
-if (LWS_WITH_ESP8266)
- set(LWS_WITH_SHARED OFF)
- set(LWS_WITH_SSL OFF)
- set(LWS_WITH_ZLIB OFF)
- set(LWS_WITHOUT_CLIENT ON)
- set(LWS_WITHOUT_TESTAPPS ON)
- set(LWS_WITHOUT_EXTENSIONS ON)
- set(LWS_WITH_PLUGINS OFF)
- set(LWS_WITH_RANGES OFF)
- # this implies no pthreads in the lib
- set(LWS_MAX_SMP 1)
- set(LWS_HAVE_MALLOC 1)
- set(LWS_HAVE_REALLOC 1)
- set(LWS_HAVE_GETIFADDRS 1)
- set(LWS_WITH_ZIP_FOPS 0)
+ set(LWS_WITH_STRUCT_SQLITE3 1)
 endif()
 
 if (LWS_WITH_ESP32)
  set(LWS_WITH_SHARED OFF)
- set(LWS_WITH_SSL ON)
+ set(LWS_WITH_MBEDTLS ON)
   # set(LWS_WITHOUT_CLIENT ON)
  set(LWS_WITHOUT_TESTAPPS ON)
  set(LWS_WITHOUT_EXTENSIONS ON)
@@ -181,21 +404,59 @@ if (LWS_WITH_ESP32)
  set(LWS_HAVE_REALLOC 1)
  set(LWS_HAVE_GETIFADDRS 1)
  set(LWS_WITH_ZIP_FOPS 1)
+ set(LWS_WITH_CUSTOM_HEADERS 0)
 endif()
 
 
 if (WIN32)
-# this implies no pthreads in the lib
 set(LWS_MAX_SMP 1)
+set(LWS_WITH_THREADPOOL 0)
 endif()
 
-
 if (LWS_WITHOUT_SERVER)
 set(LWS_WITH_LWSWS OFF)
 endif()
 
+if (LWS_WITH_LEJP_CONF)
+       set(LWS_WITH_DIR 1)
+endif()
+
+# confirm H1 relationships
+
+if (NOT LWS_ROLE_H1 AND LWS_ROLE_H2)
+       message(FATAL_ERROR "H2 requires LWS_ROLE_H1")
+endif()
+
+if (NOT LWS_ROLE_H1 AND LWS_ROLE_WS)
+       message(FATAL_ERROR "WS requires LWS_ROLE_H1")
+endif()
+
+if (NOT LWS_ROLE_H1 AND LWS_ROLE_CGI)
+       message(FATAL_ERROR "CGI requires LWS_ROLE_H1")
+endif()
+
+# confirm HTTP relationships
+
+if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_HTTP_PROXY)
+       message(FATAL_ERROR "LWS_WITH_LWSWS requires LWS_ROLE_H1")
+endif()
+
+if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_HTTP_PROXY)
+       message(FATAL_ERROR "LWS_WITH_HTTP_PROXY requires LWS_ROLE_H1")
+endif()
+
+if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_RANGES)
+       message(FATAL_ERROR "LWS_WITH_RANGES requires LWS_ROLE_H1")
+endif()
+
+if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_ACCESS_LOG)
+       message(FATAL_ERROR "LWS_WITH_ACCESS_LOG requires LWS_ROLE_H1")
+endif()
+
+
 if (LWS_WITH_HTTP_PROXY AND (LWS_WITHOUT_CLIENT OR LWS_WITHOUT_SERVER))
-       message(FATAL_ERROR "You have to enable both client and server for http proxy")
+       message("You have to enable both client and server for http proxy")
+       set(LWS_WITH_HTTP_PROXY 0)
 endif()
 
 # Allow the user to override installation directories.
@@ -205,37 +466,34 @@ set(LWS_INSTALL_INCLUDE_DIR   include CACHE PATH "Installation directory for hea
 set(LWS_INSTALL_EXAMPLES_DIR  bin CACHE PATH "Installation directory for example files")
 
 # Allow the user to use the old CyaSSL options/library in stead of wolfSSL
-if (LWS_USE_CYASSL AND LWS_USE_WOLFSSL)
-       message(FATAL_ERROR "LWS_USE_CYASSL and LWS_USE_WOLFSSL are mutually exclusive!")
+if (LWS_WITH_CYASSL AND LWS_WITH_WOLFSSL)
+       message(FATAL_ERROR "LWS_WITH_CYASSL and LWS_WITH_WOLFSSL are mutually exclusive!")
 endif()
-if (LWS_USE_CYASSL)
+if (LWS_WITH_CYASSL)
        # Copy CyaSSL options to the wolfSSL options
-       set(LWS_USE_WOLFSSL ${LWS_USE_CYASSL} CACHE BOOL "Use wolfSSL/CyaSSL instead of OpenSSL" FORCE)
+       set(LWS_WITH_WOLFSSL ${LWS_WITH_CYASSL} CACHE BOOL "Use wolfSSL/CyaSSL instead of OpenSSL" FORCE)
        set(LWS_WOLFSSL_LIBRARIES ${LWS_CYASSL_LIBRARIES} CACHE PATH "Path to wolfSSL/CyaSSL libraries" FORCE)
        set(LWS_WOLFSSL_INCLUDE_DIRS ${LWS_CYASSL_INCLUDE_DIRS} CACHE PATH "Path to wolfSSL/CyaSSL header files" FORCE)
 endif()
 
-if (LWS_WITHOUT_CLIENT AND LWS_WITHOUT_SERVER)
-       message(FATAL_ERROR "Makes no sense to compile with neither client nor server.")
-endif()
-
 if (NOT (LWS_WITH_STATIC OR LWS_WITH_SHARED))
        message(FATAL_ERROR "Makes no sense to compile with neither static nor shared libraries.")
 endif()
 
-if (NOT LWS_WITHOUT_EXTENSIONS)
-       if (NOT LWS_WITH_ZLIB)
-               message(FATAL_ERROR "zlib is required for extensions.")
-       endif()
+if (NOT LWS_WITHOUT_EXTENSIONS OR LWS_WITH_ZIP_FOPS)
+       set(LWS_WITH_ZLIB 1)
 endif()
 
-set(LWS_ZLIB_LIBRARIES CACHE PATH "Path to the zlib library")
-set(LWS_ZLIB_INCLUDE_DIRS CACHE PATH "Path to the zlib include directory")
+# if you gave LWS_WITH_MINIZ, point to MINIZ here if not found
+# automatically
+
+set(LWS_ZLIB_LIBRARIES CACHE PATH "Path to the zlib/miniz library")
+set(LWS_ZLIB_INCLUDE_DIRS CACHE PATH "Path to the zlib/miniz include directory")
 set(LWS_OPENSSL_LIBRARIES CACHE PATH "Path to the OpenSSL library")
 set(LWS_OPENSSL_INCLUDE_DIRS CACHE PATH "Path to the OpenSSL include directory")
 set(LWS_WOLFSSL_LIBRARIES CACHE PATH "Path to the wolfSSL library")
 set(LWS_WOLFSSL_INCLUDE_DIRS CACHE PATH "Path to the wolfSSL include directory")
-set( CACHE PATH "Path to the libev library")
+set(LWS_LIBEV_LIBRARIES CACHE PATH "Path to the libev library")
 set(LWS_LIBEV_INCLUDE_DIRS CACHE PATH "Path to the libev include directory")
 set(LWS_LIBUV_LIBRARIES CACHE PATH "Path to the libuv library")
 set(LWS_LIBUV_INCLUDE_DIRS CACHE PATH "Path to the libuv include directory")
@@ -249,7 +507,12 @@ if (NOT LWS_WITH_SSL)
        set(LWS_WITHOUT_BUILTIN_SHA1 OFF)
 endif()
 
-if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
+if (LWS_WITH_BORINGSSL)
+       # boringssl deprecated EVP_PKEY
+       set (LWS_WITH_GENHASH OFF)
+endif()
+
+if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL AND NOT LWS_WITH_MBEDTLS)
        if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
        else()
                if (NOT LWS_WITH_ESP32)
@@ -260,13 +523,13 @@ if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
        endif()
 endif()
 
-if (LWS_WITH_SSL AND LWS_USE_WOLFSSL)
+if (LWS_WITH_SSL AND LWS_WITH_WOLFSSL)
        if ("${LWS_WOLFSSL_LIBRARIES}" STREQUAL "" OR "${LWS_WOLFSSL_INCLUDE_DIRS}" STREQUAL "")
                if (NOT WOLFSSL_FOUND)
-                       if (LWS_USE_CYASSL)
-                               message(FATAL_ERROR "You must set LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS when LWS_USE_CYASSL is turned on.")
+                       if (LWS_WITH_CYASSL)
+                               message(FATAL_ERROR "You must set LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS when LWS_WITH_CYASSL is turned on.")
                        else()
-                               message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_USE_WOLFSSL is turned on.")
+                               message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_WITH_WOLFSSL is turned on.")
                        endif()
                endif()
        else()
@@ -275,12 +538,44 @@ if (LWS_WITH_SSL AND LWS_USE_WOLFSSL)
                set(WOLFSSL_FOUND 1)
        endif()
        set(USE_WOLFSSL 1)
-       if (LWS_USE_CYASSL)
+       set(LWS_WITH_TLS 1)
+       if (LWS_WITH_CYASSL)
                set(USE_OLD_CYASSL 1)
        endif()
 endif()
 
-if (LWS_WITH_ZLIB AND NOT LWS_USE_BUNDLED_ZLIB)
+if (LWS_WITH_SSL AND LWS_WITH_MBEDTLS)
+       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)
+
+               find_library(MBEDTLS_LIBRARY mbedtls)
+               find_library(MBEDX509_LIBRARY mbedx509)
+               find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
+
+               set(LWS_MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")
+
+               include(FindPackageHandleStandardArgs)
+               find_package_handle_standard_args(MBEDTLS DEFAULT_MSG
+                       LWS_MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
+
+               mark_as_advanced(LWS_MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
+
+               if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "")
+                       message(FATAL_ERROR "You must set LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS when LWS_WITH_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(USE_MBEDTLS 1)
+endif()
+
+if (LWS_WITH_HTTP_STREAM_COMPRESSION)
+       set(LWS_WITH_ZLIB 1)
+endif()
+
+if (LWS_WITH_ZLIB AND NOT LWS_WITH_BUNDLED_ZLIB)
        if ("${LWS_ZLIB_LIBRARIES}" STREQUAL "" OR "${LWS_ZLIB_INCLUDE_DIRS}" STREQUAL "")
        else()
                set(ZLIB_LIBRARIES ${LWS_ZLIB_LIBRARIES})
@@ -326,6 +621,10 @@ if (LWS_WITH_SQLITE3)
 endif()
 
 
+if (LWS_WITH_LIBEV AND LWS_WITH_LIBEVENT)
+       message(FATAL_ERROR "Sorry libev and libevent conflict with each others' namespace, you can only have one or the other")
+endif()
+
 # The base dir where the test-apps look for the SSL certs.
 set(LWS_OPENSSL_CLIENT_CERTS ../share CACHE PATH "Server SSL certificate directory")
 if (WIN32)
@@ -339,12 +638,10 @@ else()
        set(LWS_OPENSSL_CLIENT_CERTS /etc/pki/tls/certs/ CACHE PATH "Client SSL certificate directory")
 endif()
 
-if (LWS_WITHOUT_EXTENSIONS)
-       set(LWS_NO_EXTENSIONS 1)
-endif()
-
-if (LWS_WITH_SSL)
+# LWS_OPENSSL_SUPPORT deprecated... use LWS_WITH_TLS
+if (LWS_WITH_SSL OR LWS_WITH_MBEDTLS)
        set(LWS_OPENSSL_SUPPORT 1)
+       set(LWS_WITH_TLS 1)
 endif()
 
 if (LWS_SSL_CLIENT_USE_OS_CA_CERTS)
@@ -368,41 +665,45 @@ if (LWS_WITHOUT_CLIENT)
 endif()
 
 if (LWS_WITH_LIBEV)
-       set(LWS_USE_LIBEV 1)
+       set(LWS_WITH_LIBEV 1)
 endif()
 
 if (LWS_WITH_LIBUV)
-       set(LWS_USE_LIBUV 1)
+       set(LWS_WITH_LIBUV 1)
 endif()
 
 if (LWS_WITH_LIBEVENT)
-       set(LWS_USE_LIBEVENT 1)
+       set(LWS_WITH_LIBEVENT 1)
 endif()
 
 if (LWS_IPV6)
-       set(LWS_USE_IPV6 1)
+       set(LWS_WITH_IPV6 1)
 endif()
 
 if (LWS_UNIX_SOCK)
-    set(LWS_USE_UNIX_SOCK 1)
+    set(LWS_WITH_UNIX_SOCK 1)
 endif()
 
 if (LWS_WITH_HTTP2)
-       set(LWS_USE_HTTP2 1)
+       set(LWS_WITH_HTTP2 1)
 endif()
 
 if ("${LWS_MAX_SMP}" STREQUAL "")
        set(LWS_MAX_SMP 1)
 endif()
 
+# using any abstract protocol enables LWS_WITH_ABSTRACT
 
-if (LWS_WITH_ESP8266)
-set(CMAKE_C_FLAGS "-nostdlib ${CMAKE_C_FLAGS}")
+if (LWS_WITH_SMTP)
+       set(LWS_WITH_ABSTRACT 1)
 endif()
 
+
+
 if (MINGW)
        set(LWS_MINGW_SUPPORT 1)
        set(CMAKE_C_FLAGS "-D__USE_MINGW_ANSI_STDIO ${CMAKE_C_FLAGS}")
+       add_definitions(-DWINVER=0x0601 -D_WIN32_WINNT=0x0601)
 endif()
 
 if (LWS_SSL_SERVER_WITH_ECDH_CERT)
@@ -450,12 +751,25 @@ include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(CheckTypeSize)
+include(CheckCSourceCompiles)
 
 if (LWS_WITHOUT_BUILTIN_SHA1)
        set(LWS_SHA1_USE_OPENSSL_NAME 1)
 endif()
 
-CHECK_FUNCTION_EXISTS(bzero LWS_HAVE_BZERO)
+if (HAIKU)
+       set(CMAKE_REQUIRED_LIBRARIES network)
+endif()
+
+CHECK_C_SOURCE_COMPILES(
+       "#include <malloc.h>
+       int main(int argc, char **argv) { return malloc_trim(0); }
+       " LWS_HAVE_MALLOC_TRIM)
+CHECK_C_SOURCE_COMPILES(
+       "#include <malloc.h>
+       int main(int argc, char **argv) { return (int)malloc_usable_size((void *)0); }
+       " LWS_HAVE_MALLOC_USABLE_SIZE)
+
 CHECK_FUNCTION_EXISTS(fork LWS_HAVE_FORK)
 CHECK_FUNCTION_EXISTS(getenv LWS_HAVE_GETENV)
 CHECK_FUNCTION_EXISTS(malloc LWS_HAVE_MALLOC)
@@ -473,6 +787,7 @@ CHECK_FUNCTION_EXISTS(getloadavg LWS_HAVE_GETLOADAVG)
 CHECK_FUNCTION_EXISTS(atoll LWS_HAVE_ATOLL)
 CHECK_FUNCTION_EXISTS(_atoi64 LWS_HAVE__ATOI64)
 CHECK_FUNCTION_EXISTS(_stat32i64 LWS_HAVE__STAT32I64)
+CHECK_FUNCTION_EXISTS(clock_gettime LWS_HAVE_CLOCK_GETTIME)
 
 if (NOT LWS_HAVE_GETIFADDRS)
        if (LWS_WITHOUT_BUILTIN_GETIFADDRS)
@@ -484,7 +799,6 @@ endif()
 CHECK_INCLUDE_FILE(dlfcn.h LWS_HAVE_DLFCN_H)
 CHECK_INCLUDE_FILE(fcntl.h LWS_HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE(in6addr.h LWS_HAVE_IN6ADDR_H)
-CHECK_INCLUDE_FILE(inttypes.h LWS_HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILE(memory.h LWS_HAVE_MEMORY_H)
 CHECK_INCLUDE_FILE(netinet/in.h LWS_HAVE_NETINET_IN_H)
 CHECK_INCLUDE_FILE(stdint.h LWS_HAVE_STDINT_H)
@@ -499,16 +813,65 @@ CHECK_INCLUDE_FILE(sys/types.h LWS_HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE(unistd.h LWS_HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE(vfork.h LWS_HAVE_VFORK_H)
 CHECK_INCLUDE_FILE(sys/capability.h LWS_HAVE_SYS_CAPABILITY_H)
+CHECK_INCLUDE_FILE(malloc.h LWS_HAVE_MALLOC_H)
+CHECK_INCLUDE_FILE(pthread.h LWS_HAVE_PTHREAD_H)
+CHECK_INCLUDE_FILE(inttypes.h LWS_HAVE_INTTYPES_H)
 
-CHECK_LIBRARY_EXISTS(cap cap_set_flag "" LWS_HAVE_LIBCAP) 
+CHECK_LIBRARY_EXISTS(cap cap_set_flag "" LWS_HAVE_LIBCAP)
+
+if (LWS_ROLE_DBUS)
+
+       if (NOT LWS_DBUS_LIB)
+               set(LWS_DBUS_LIB "dbus-1")
+       endif()
+
+       CHECK_LIBRARY_EXISTS(${LWS_DBUS_LIB} dbus_connection_set_watch_functions "" LWS_HAVE_LIBDBUS)
+       if (NOT LWS_HAVE_LIBDBUS)
+               message(FATAL_ERROR "Install dbus-devel, or libdbus-1-dev etc")
+       endif()
+
+       if (NOT LWS_DBUS_INCLUDE1)
+               # look in fedora and debian / ubuntu place
+               if (EXISTS "/usr/include/dbus-1.0")
+                       set(LWS_DBUS_INCLUDE1 "/usr/include/dbus-1.0")
+               else()
+                       message(FATAL_ERROR "Set LWS_DBUS_INCLUDE1 to /usr/include/dbus-1.0 or wherever the main dbus includes are")
+               endif()
+       endif()
+
+       if (NOT LWS_DBUS_INCLUDE2)
+               # look in fedora... debian / ubuntu has the ARCH in the path...
+               if (EXISTS "/usr/lib64/dbus-1.0/include")
+                       set(LWS_DBUS_INCLUDE2 "/usr/lib64/dbus-1.0/include")
+               else()
+                       message(FATAL_ERROR "Set LWS_DBUS_INCLUDE2 to /usr/lib/ARCH-linux-gnu/dbus-1.0/include or wherever dbus-arch-deps.h is on your system")
+               endif()
+       endif()
+
+       set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${LWS_DBUS_INCLUDE1};${LWS_DBUS_INCLUDE2})
+
+       CHECK_C_SOURCE_COMPILES("#include <dbus/dbus.h>
+       int main(void) {
+               return 0;
+       }" LWS_DBUS_CHECK_OK)
+endif()
 
 if (LWS_WITH_LIBUV)
 CHECK_INCLUDE_FILE(uv-version.h LWS_HAVE_UV_VERSION_H)
+  # libuv changed the location in 1.21.0. Retain both
+  # checks temporarily to ensure a smooth transition.
+  if (NOT LWS_HAVE_UV_VERSION_H)
+    CHECK_INCLUDE_FILE(uv/version.h LWS_HAVE_NEW_UV_VERSION_H)
+  endif()
 endif()
 
 
-if (LWS_WITH_ZLIB AND NOT LWS_USE_BUNDLED_ZLIB)
-       CHECK_INCLUDE_FILE(zlib.h LWS_HAVE_ZLIB_H)
+if (LWS_WITH_ZLIB AND NOT LWS_WITH_BUNDLED_ZLIB)
+       if (LWS_WITH_MINIZ)
+               CHECK_INCLUDE_FILE(miniz.h LWS_HAVE_ZLIB_H)
+       else()
+               CHECK_INCLUDE_FILE(zlib.h LWS_HAVE_ZLIB_H)
+       endif()
 endif()
 
 # TODO: These can also be tested to see whether they actually work...
@@ -523,180 +886,536 @@ CHECK_C_SOURCE_COMPILES("#include <stdint.h>
                return 0;
        }" LWS_HAS_INTPTR_T)
 
-# These don't work Cross...
-#CHECK_TYPE_SIZE(pid_t PID_T_SIZE)
-#CHECK_TYPE_SIZE(size_t SIZE_T_SIZE)
-#CHECK_TYPE_SIZE("void *" LWS_SIZEOFPTR LANGUAGE C)
+set(CMAKE_REQUIRED_FLAGS "-pthread")   
+CHECK_C_SOURCE_COMPILES("#define _GNU_SOURCE 
+       #include <pthread.h> 
+       int main(void) { 
+               pthread_t th = 0;
+               pthread_setname_np(th, NULL);
+               return 0;
+       }" LWS_HAS_PTHREAD_SETNAME_NP)
+
+CHECK_C_SOURCE_COMPILES("#include <stddef.h>
+       #include <getopt.h> 
+       int main(void) { 
+               void *p = (void *)getopt_long;
+               return p != NULL;
+       }" LWS_HAS_GETOPT_LONG)
+
+
+if (NOT PID_T_SIZE)
+       set(pid_t int)
+endif()
+
+if (NOT SIZE_T_SIZE)
+       set(size_t "unsigned int")
+endif()
+
+if (NOT LWS_HAVE_MALLOC)
+       set(malloc rpl_malloc)
+endif()
+
+if (NOT LWS_HAVE_REALLOC)
+       set(realloc rpl_realloc)
+endif()
+
+if (UNIX)
+       execute_process(COMMAND uname -n OUTPUT_VARIABLE NODENAME)
+       # Need to chomp the \n at end of output.
+       string(REGEX REPLACE "[\n]+" "" NODENAME "${NODENAME}")
+
+       if( NODENAME STREQUAL "smartos" )
+               add_definitions( "-D__smartos__" )
+               set(SMARTOS 1)
+       endif()
+endif()
+
+if (MSVC)
+       # Turn off stupid microsoft security warnings.
+       add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+endif(MSVC)
+
+include_directories("${PROJECT_SOURCE_DIR}/lib")
+
+# Group headers and sources.
+# Some IDEs use this for nicer file structure.
+set(HDR_PRIVATE
+       lib/core/private.h)
+
+set(HDR_PUBLIC
+       "${PROJECT_SOURCE_DIR}/include/libwebsockets.h"
+       "${PROJECT_BINARY_DIR}/lws_config.h"
+       "${PROJECT_SOURCE_DIR}/plugins/ssh-base/include/lws-plugin-ssh.h"
+       )
+
+set(SOURCES
+       lib/core/alloc.c
+       lib/core/buflist.c
+       lib/core/context.c
+       lib/core/lws_dll2.c
+       lib/core/libwebsockets.c
+       lib/core/logs.c
+       lib/misc/base64-decode.c
+       lib/core/vfs.c
+       lib/misc/lws-ring.c
+)
+
+if (LWS_WITH_DEPRECATED_LWS_DLL)
+       list(APPEND SOURCES
+               lib/core/lws_dll.c)
+endif()
+       
+if (LWS_WITH_NETWORK)
+       list(APPEND SOURCES
+               lib/core-net/dummy-callback.c
+               lib/core-net/output.c
+               lib/core-net/close.c
+               lib/core-net/network.c
+               lib/core-net/vhost.c
+               lib/core-net/pollfd.c
+               lib/core-net/service.c
+               lib/core-net/sorted-usec-list.c
+               lib/core-net/stats.c
+               lib/core-net/wsi.c
+               lib/core-net/wsi-timeout.c
+               lib/core-net/adopt.c
+               lib/roles/pipe/ops-pipe.c
+       )
+
+       if (LWS_WITH_LWS_DSH)
+               list(APPEND SOURCES
+                       lib/core-net/lws-dsh.c)
+       endif()
+
+       if (LWS_WITH_SEQUENCER)
+               list(APPEND SOURCES
+                       lib/core-net/sequencer.c)
+       endif()
+
+       if (LWS_WITH_ABSTRACT)
+               list(APPEND SOURCES
+                       lib/abstract/abstract.c
+               )
+               if (LWS_WITH_SEQUENCER)
+                       list(APPEND SOURCES
+                               lib/abstract/test-sequencer.c)
+               endif()
+       endif()
+
+       if (LWS_WITH_STATS)
+               list(APPEND SOURCES
+                       lib/core-net/stats.c
+               )
+       endif()
+endif()
+
+if (LWS_WITH_DIR)
+       list(APPEND SOURCES lib/misc/dir.c)
+endif()
+       
+if (LWS_WITH_THREADPOOL AND UNIX AND LWS_HAVE_PTHREAD_H)
+       list(APPEND SOURCES lib/misc/threadpool/threadpool.c)
+endif()
+
+if (LWS_ROLE_H1 OR LWS_ROLE_H2)
+       list(APPEND SOURCES
+               lib/roles/http/header.c
+               lib/roles/http/server/parsers.c)
+       if (LWS_WITH_HTTP_STREAM_COMPRESSION)
+               list(APPEND SOURCES
+                       lib/roles/http/compression/stream.c
+                       lib/roles/http/compression/deflate/deflate.c)
+               if (LWS_WITH_HTTP_BROTLI)
+                       list(APPEND SOURCES
+                               lib/roles/http/compression/brotli/brotli.c)
+               endif()
+       endif()
+endif()
+
+if (LWS_ROLE_H1)
+       list(APPEND SOURCES
+               lib/roles/h1/ops-h1.c)
+endif()
+
+if (LWS_ROLE_WS)
+       list(APPEND SOURCES
+               lib/roles/ws/ops-ws.c)
+       if (NOT LWS_WITHOUT_CLIENT)
+               list(APPEND SOURCES
+                       lib/roles/ws/client-ws.c
+                       lib/roles/ws/client-parser-ws.c)
+       endif()
+       if (NOT LWS_WITHOUT_SERVER)
+               list(APPEND SOURCES
+                       lib/roles/ws/server-ws.c)
+       endif()
+endif()
+
+if (LWS_ROLE_RAW)
+       list(APPEND SOURCES
+               lib/roles/raw-skt/ops-raw-skt.c
+               lib/roles/raw-file/ops-raw-file.c)
+               
+       if (LWS_WITH_ABSTRACT)
+               list(APPEND SOURCES
+                       lib/abstract/transports/raw-skt.c)
+       endif()
+endif()
 
-if (NOT PID_T_SIZE)
-       set(pid_t int)
+if (LWS_ROLE_RAW_PROXY)
+       list(APPEND SOURCES
+               lib/roles/raw-proxy/ops-raw-proxy.c)
 endif()
 
-if (NOT SIZE_T_SIZE)
-       set(size_t "unsigned int")
+if (LWS_ROLE_CGI)
+       list(APPEND SOURCES
+               lib/roles/cgi/cgi-server.c
+               lib/roles/cgi/ops-cgi.c)
 endif()
 
-if (NOT LWS_HAVE_MALLOC)
-       set(malloc rpl_malloc)
+if (LWS_ROLE_DBUS)
+       list(APPEND SOURCES
+               lib/roles/dbus/dbus.c)
 endif()
 
-if (NOT LWS_HAVE_REALLOC)
-       set(realloc rpl_realloc)
+if (LWS_WITH_ACCESS_LOG)
+       list(APPEND SOURCES
+               lib/roles/http/server/access-log.c)
 endif()
 
+if (LWS_WITH_PEER_LIMITS)
+       list(APPEND SOURCES
+               lib/misc/peer-limits.c)
+endif()
 
-if (MSVC)
-       # Turn off stupid microsoft security warnings.
-       add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
-endif(MSVC)
+if (LWS_WITH_LWSAC)
+       list(APPEND SOURCES
+               lib/misc/lwsac/lwsac.c
+               lib/misc/lwsac/cached-file.c)
+endif()
 
-include_directories("${PROJECT_SOURCE_DIR}/lib")
+if (LWS_WITH_FTS)
+       list(APPEND SOURCES
+               lib/misc/fts/trie.c
+               lib/misc/fts/trie-fd.c)
+endif()
 
-# Group headers and sources.
-# Some IDEs use this for nicer file structure.
-set(HDR_PRIVATE
-       lib/private-libwebsockets.h)
+if (LWS_WITH_DISKCACHE)
+       list(APPEND SOURCES
+               lib/misc/diskcache.c)
+endif()
 
-set(HDR_PUBLIC
-       "${PROJECT_SOURCE_DIR}/lib/libwebsockets.h"
-       "${PROJECT_BINARY_DIR}/lws_config.h")
+if (LWS_WITH_STRUCT_JSON)
+       list(APPEND SOURCES
+               lib/misc/lws-struct-lejp.c)
+endif()
 
-set(SOURCES
-       lib/base64-decode.c
-       lib/handshake.c
-       lib/libwebsockets.c
-       lib/service.c
-       lib/pollfd.c
-       lib/output.c
-       lib/parsers.c
-       lib/context.c
-       lib/alloc.c
-       lib/header.c)
+if (LWS_WITH_STRUCT_SQLITE3)
+       list(APPEND SOURCES
+               lib/misc/lws-struct-sqlite.c)
+endif()
 
 if (NOT LWS_WITHOUT_CLIENT)
        list(APPEND SOURCES
-               lib/client.c
-               lib/client-handshake.c
-               lib/client-parser.c)
+               lib/core-net/connect.c
+               lib/core-net/client.c
+               lib/roles/http/client/client.c
+               lib/roles/http/client/client-handshake.c)
+endif()
+
+if (NOT LWS_WITHOUT_SERVER)
+       list(APPEND SOURCES
+               lib/core-net/server.c
+               lib/roles/listen/ops-listen.c)
+endif()
+
+if (LWS_WITH_MBEDTLS)
+       set(LWS_WITH_SSL ON)
+       
+       include_directories(lib/tls/mbedtls/wrapper/include)
+       include_directories(lib/tls/mbedtls/wrapper/include/platform)
+       include_directories(lib/tls/mbedtls/wrapper/include/internal)
+       include_directories(lib/tls/mbedtls/wrapper/include/openssl)
+       
+       if (LWS_WITH_NETWORK)
+               list(APPEND HDR_PRIVATE
+                       lib/tls/mbedtls/wrapper/include/internal/ssl3.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_cert.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_code.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_lib.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_methods.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_pkey.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_stack.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
+                       lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h
+                       lib/tls/mbedtls/wrapper/include/internal/tls1.h
+                       lib/tls/mbedtls/wrapper/include/internal/x509_vfy.h)
+       
+               list(APPEND HDR_PRIVATE
+                       lib/tls/mbedtls/wrapper/include/openssl/ssl.h)
+       
+               list(APPEND HDR_PRIVATE
+                       lib/tls/mbedtls/wrapper/include/platform/ssl_pm.h
+                       lib/tls/mbedtls/wrapper/include/platform/ssl_port.h)
+       
+               list(APPEND SOURCES
+                       lib/tls/mbedtls/wrapper/library/ssl_cert.c
+                       lib/tls/mbedtls/wrapper/library/ssl_lib.c
+                       lib/tls/mbedtls/wrapper/library/ssl_methods.c
+                       lib/tls/mbedtls/wrapper/library/ssl_pkey.c
+                       lib/tls/mbedtls/wrapper/library/ssl_stack.c
+                       lib/tls/mbedtls/wrapper/library/ssl_x509.c)
+       
+               list(APPEND SOURCES
+                       lib/tls/mbedtls/wrapper/platform/ssl_pm.c
+                       lib/tls/mbedtls/wrapper/platform/ssl_port.c)
+       endif()
 endif()
 
 if (LWS_WITH_SSL)
        list(APPEND SOURCES
-               lib/ssl.c)
+               lib/tls/tls.c
+       )
+       if (LWS_WITH_NETWORK)
+               list(APPEND SOURCES
+                       lib/tls/tls-network.c
+               )
+       endif()
+               
+       if (LWS_WITH_MBEDTLS)
+               list(APPEND SOURCES
+                       lib/tls/mbedtls/tls.c
+                       lib/tls/mbedtls/x509.c
+               )
+               if (LWS_WITH_NETWORK)
+                       list(APPEND SOURCES
+                               lib/tls/mbedtls/ssl.c
+                       )
+               endif()
+               if (LWS_WITH_GENCRYPTO)
+                       list(APPEND SOURCES
+                               lib/tls/mbedtls/lws-genhash.c
+                               lib/tls/mbedtls/lws-genrsa.c
+                               lib/tls/mbedtls/lws-genaes.c
+                               lib/tls/lws-genec-common.c
+                               lib/tls/mbedtls/lws-genec.c
+                               lib/tls/mbedtls/lws-gencrypto.c
+                       )
+               endif()
+       else()
+               list(APPEND SOURCES
+                       lib/tls/openssl/tls.c
+                       lib/tls/openssl/x509.c
+               )
+               if (LWS_WITH_NETWORK)
+                       list(APPEND SOURCES
+                               lib/tls/openssl/ssl.c
+                       )
+               endif()
+               if (LWS_WITH_GENCRYPTO)
+                       list(APPEND SOURCES
+                               lib/tls/openssl/lws-genhash.c
+                               lib/tls/openssl/lws-genrsa.c
+                               lib/tls/openssl/lws-genaes.c
+                               lib/tls/lws-genec-common.c
+                               lib/tls/openssl/lws-genec.c
+                               lib/tls/openssl/lws-gencrypto.c
+                       )
+               endif()
+       endif()
                
        if (NOT LWS_WITHOUT_SERVER)
                list(APPEND SOURCES
-               lib/ssl-server.c)
+                       lib/tls/tls-server.c)
+               if (LWS_WITH_MBEDTLS)
+                       list(APPEND SOURCES
+                               lib/tls/mbedtls/mbedtls-server.c)
+               else()
+                       list(APPEND SOURCES
+                               lib/tls/openssl/openssl-server.c)
+               endif()
        endif()
        if (NOT LWS_WITHOUT_CLIENT)
                list(APPEND SOURCES
-               lib/ssl-client.c)
+                       lib/tls/tls-client.c)
+               if (LWS_WITH_MBEDTLS)
+                       list(APPEND SOURCES
+                               lib/tls/mbedtls/mbedtls-client.c)
+               else()
+                       list(APPEND SOURCES
+                               lib/tls/openssl/openssl-client.c)
+               endif()
+               
        endif()
 endif()
 
 if (NOT LWS_WITHOUT_BUILTIN_SHA1)
        list(APPEND SOURCES
-               lib/sha-1.c)
+               lib/misc/sha-1.c)
 endif()
 
-if (LWS_WITH_HTTP2)
+if (LWS_WITH_HTTP2 AND NOT LWS_WITHOUT_SERVER)
        list(APPEND SOURCES
-               lib/http2.c
-               lib/hpack.c
-               lib/ssl-http2.c)
+               lib/roles/h2/http2.c
+               lib/roles/h2/hpack.c
+               lib/roles/h2/ops-h2.c)
 endif()
 # select the active platform files
 
 if (WIN32)
        list(APPEND SOURCES
-               lib/lws-plat-win.c)
+               lib/plat/windows/windows-fds.c
+               lib/plat/windows/windows-file.c
+               lib/plat/windows/windows-init.c
+               lib/plat/windows/windows-misc.c
+               lib/plat/windows/windows-pipe.c
+               lib/plat/windows/windows-plugins.c
+               lib/plat/windows/windows-service.c
+               lib/plat/windows/windows-sockets.c
+               )
 else()
 
-       if (LWS_WITH_ESP8266)
+       if (LWS_PLAT_OPTEE)
                list(APPEND SOURCES
-                       lib/lws-plat-esp8266.c)
+                       lib/plat/optee/lws-plat-optee.c
+               )
+               if (LWS_WITH_NETWORK)
+                       list(APPEND SOURCES
+                               lib/plat/optee/network.c
+                       )
+               endif()
        else()
-               if (LWS_PLAT_OPTEE)
+               if (LWS_WITH_ESP32)
                        list(APPEND SOURCES
-                               lib/lws-plat-optee.c)
+                               lib/plat/esp32/esp32-fds.c
+                               lib/plat/esp32/esp32-file.c
+                               lib/plat/esp32/esp32-init.c
+                               lib/plat/esp32/esp32-misc.c
+                               lib/plat/esp32/esp32-pipe.c
+                               lib/plat/esp32/esp32-service.c
+                               lib/plat/esp32/esp32-sockets.c
+                               lib/misc/romfs.c)
+                       if(LWS_WITH_ESP32_HELPER)
+                               list(APPEND SOURCES lib/plat/esp32/esp32-helpers.c)
+                       endif()
                else()
-                       if (LWS_WITH_ESP32)
-                               list(APPEND SOURCES
-                                       lib/lws-plat-esp32.c
-                                       lib/romfs.c)
-                       else()
+                       set(LWS_PLAT_UNIX 1)
+                       list(APPEND SOURCES
+                               lib/plat/unix/unix-caps.c
+                               lib/plat/unix/unix-file.c
+                               lib/plat/unix/unix-misc.c
+                               lib/plat/unix/unix-init.c
+                       )
+                       if (LWS_WITH_NETWORK)
                                list(APPEND SOURCES
-                                       lib/lws-plat-unix.c)
+                                       lib/plat/unix/unix-pipe.c
+                                       lib/plat/unix/unix-service.c
+                                       lib/plat/unix/unix-sockets.c
+                                       lib/plat/unix/unix-fds.c
+                               )
+                       endif()
+                               
+                       if (LWS_WITH_PLUGINS AND LWS_WITH_LIBUV)
+                               list(APPEND SOURCES lib/plat/unix/unix-plugins.c)
                        endif()
                endif()
        endif()
 endif()
 
-if (NOT LWS_WITHOUT_SERVER)
+if ((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_SERVER)
        list(APPEND SOURCES
-               lib/server.c
-               lib/server-handshake.c)
+               lib/roles/http/server/server.c
+               lib/roles/http/server/lws-spa.c)
 endif()
 
-if (NOT LWS_WITHOUT_EXTENSIONS)
+if (LWS_ROLE_WS AND NOT LWS_WITHOUT_EXTENSIONS)
        list(APPEND HDR_PRIVATE
-               lib/extension-permessage-deflate.h)
+               lib/roles/ws/ext/extension-permessage-deflate.h)
        list(APPEND SOURCES
-               lib/extension.c
-               lib/extension-permessage-deflate.c)
+               lib/roles/ws/ext/extension.c
+               lib/roles/ws/ext/extension-permessage-deflate.c)
 endif()
 
 if (LWS_WITH_HTTP_PROXY)
        list(APPEND SOURCES
-               lib/rewrite.c)
+               lib/roles/http/server/rewrite.c)
 endif()
 
-if (LWS_WITH_LIBEV)
+if (LWS_WITH_POLL AND LWS_WITH_NETWORK)
        list(APPEND SOURCES
-               lib/libev.c)
+               lib/event-libs/poll/poll.c)
 endif()
 
-if (LWS_WITH_LIBUV)
+if (LWS_WITH_LIBUV AND LWS_WITH_NETWORK)
        list(APPEND SOURCES
-               lib/libuv.c)
+               lib/event-libs/libuv/libuv.c)
 endif()
 
-if (LWS_WITH_LIBEVENT)
+if (LWS_WITH_LIBEVENT AND LWS_WITH_NETWORK)
+       list(APPEND SOURCES
+               lib/event-libs/libevent/libevent.c)
+endif()
+
+if (LWS_WITH_LIBEV AND LWS_WITH_NETWORK)
        list(APPEND SOURCES
-               lib/libevent.c)
+               lib/event-libs/libev/libev.c)
 endif()
 
 if (LWS_WITH_LEJP)
        list(APPEND SOURCES
-               lib/lejp.c)
-       list(APPEND HDR_PUBLIC
-               lib/lejp.h)
+               lib/misc/lejp.c)
 endif()        
-if (LWS_WITH_LEJP_CONF)
+if (LWS_WITH_LEJP_CONF AND LWS_WITH_NETWORK AND NOT LWS_PLAT_OPTEE)
                list(APPEND SOURCES
-                       "lib/lejp-conf.c"
+                       "lib/roles/http/server/lejp-conf.c"
                )
 endif()
 
+if (LWS_WITH_ABSTRACT)
+       list(APPEND SOURCES
+               lib/abstract/transports/unit-test.c)
+endif()
+
 if (LWS_WITH_SMTP)
        list(APPEND SOURCES
-               lib/smtp.c)
+               lib/abstract/protocols/smtp/smtp.c)
 endif()
 
 if (LWS_WITH_RANGES)
        list(APPEND SOURCES
-               lib/ranges.c)
+               lib/roles/http/server/ranges.c)
 endif()
 
 if (LWS_WITH_ZIP_FOPS)
        if (LWS_WITH_ZLIB)
                list(APPEND SOURCES
-                       lib/fops-zip.c)
+                       lib/roles/http/server/fops-zip.c)
        else()
                message(FATAL_ERROR "Pre-zipped file support (LWS_WITH_ZIP_FOPS) requires ZLIB (LWS_WITH_ZLIB)")
        endif()
 endif()
 
+if (LWS_WITH_JOSE)
+       list(APPEND SOURCES
+               lib/jose/jwk/jwk.c
+               lib/jose/jws/jose.c
+               lib/jose/jws/jws.c
+               lib/jose/jwe/jwe.c
+               lib/jose/jwe/enc/aescbc.c
+               lib/jose/jwe/enc/aesgcm.c
+               lib/jose/jwe/enc/aeskw.c
+               lib/jose/jwe/jwe-rsa-aescbc.c
+               lib/jose/jwe/jwe-rsa-aesgcm.c
+               lib/jose/jwe/jwe-ecdh-es-aeskw.c
+               )
+endif()
+
+if (LWS_WITH_JOSE OR LWS_WITH_GENCRYPTO)
+       list(APPEND SOURCES
+               lib/tls/lws-gencrypto-common.c)
+endif()
+
 # Add helper files for Windows.
 if (WIN32)
        set(WIN32_HELPERS_PATH win32port/win32helpers)
@@ -716,46 +1435,82 @@ else()
        # Unix.
        if (NOT LWS_WITHOUT_DAEMONIZE)
                list(APPEND SOURCES
-                       lib/daemonize.c)
+                       lib/misc/daemonize.c)
        endif()
 endif()
 
 if (UNIX)
        if (NOT LWS_HAVE_GETIFADDRS)
-               list(APPEND HDR_PRIVATE lib/getifaddrs.h)
-               list(APPEND SOURCES lib/getifaddrs.c)
+               list(APPEND HDR_PRIVATE lib/misc/getifaddrs.h)
+               list(APPEND SOURCES lib/misc/getifaddrs.c)
        endif()
 endif()
 
-if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+       set(COMPILER_IS_CLANG ON)
+endif()
+
+if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
     include (CheckCCompilerFlag)
     CHECK_C_COMPILER_FLAG(-fvisibility=hidden LWS_HAVE_VISIBILITY)
     if (LWS_HAVE_VISIBILITY)
                 set(VISIBILITY_FLAG -fvisibility=hidden)
     endif()
-    if (UNIX OR LWS_WITH_ESP8266)
-               set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
+    if (LWS_WITH_GCOV)
+           set (GCOV_FLAGS "-fprofile-arcs -ftest-coverage ")
+    endif()
+
+       if (LWS_WITH_ASAN)
+               set (ASAN_FLAGS "-fsanitize=address -fsanitize=undefined -fsanitize-address-use-after-scope -fsanitize-undefined-trap-on-error")
+               if (NOT COMPILER_IS_CLANG)
+                       set (ASAN_FLAGS "${ASAN_FLAGS} -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=leak")
+               endif()
+               message("Enabling ASAN")
+       endif()
+
+       check_c_compiler_flag("-Wignored-qualifiers" LWS_GCC_HAS_IGNORED_QUALIFIERS)
+       check_c_compiler_flag("-Wtype-limits" LWS_GCC_HAS_TYPE_LIMITS)
+
+       if (LWS_GCC_HAS_IGNORED_QUALIFIERS)
+               set(CMAKE_C_FLAGS "-Wignored-qualifiers ${CMAKE_C_FLAGS}" )
+       endif()
+
+       if (LWS_GCC_HAS_TYPE_LIMITS)
+               set(CMAKE_C_FLAGS "-Wtype-limits ${CMAKE_C_FLAGS}" )
+       endif()
+
+    if (UNIX AND NOT LWS_WITH_ESP32)
+           set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" )
     else()
-               set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
+           set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" )
     endif()
 endif ()
 
+if (LWS_PLAT_OPTEE)
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot ../../../../lib/libutils/isoc/include -I../../../../lib/libutils/isoc/include -I../../../../lib/libutils/ext/include" )
+endif()
+
 if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT LWS_WITHOUT_TESTAPPS)
-       if (UNIX AND LWS_MAX_SMP GREATER 1)
+       if (UNIX AND LWS_HAVE_PTHREAD_H)
        # jeez clang understands -pthread but dies if he sees it at link time!
        # http://stackoverflow.com/questions/2391194/what-is-gs-pthread-equiv-in-clang
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread" )
     endif()
 endif()
 
-if ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if (COMPILER_IS_CLANG)
+
        # otherwise osx blows a bunch of openssl deprecated api errors
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations" )
+       if (UNIX AND LWS_HAVE_PTHREAD_H)
+               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread" )
+       endif()
 endif()
 
 source_group("Headers Private"  FILES ${HDR_PRIVATE})
 source_group("Headers Public"   FILES ${HDR_PUBLIC})
 source_group("Sources"          FILES ${SOURCES})
+source_group("Resources"        FILES ${RESOURCES})
 
 #
 # Create the lib.
@@ -781,9 +1536,16 @@ if (LWS_WITH_STATIC)
        endif()
        add_custom_command(
                      TARGET websockets
-                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/libwebsockets.h
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets.h
                                                         ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
        )
+
+       add_custom_command(
+                     TARGET websockets
+                     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets/
+                                                                       ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets
+       )
+
        add_custom_command(
                      TARGET websockets
                      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lws_config.h
@@ -796,7 +1558,8 @@ if (LWS_WITH_SHARED)
        add_library(websockets_shared SHARED
                                ${HDR_PRIVATE}
                                ${HDR_PUBLIC}
-                               ${SOURCES})
+                               ${SOURCES}
+                               ${RESOURCES})
        list(APPEND LWS_LIBRARIES websockets_shared)
 
        # We want the shared lib to be named "libwebsockets"
@@ -820,9 +1583,16 @@ if (LWS_WITH_SHARED)
 
        add_custom_command(
                      TARGET websockets_shared
-                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/libwebsockets.h
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets.h
                                                         ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
        )
+
+       add_custom_command(
+                     TARGET websockets
+                     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets
+                                                                       ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets
+       )
+
        add_custom_command(
                      TARGET websockets_shared
                      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lws_config.h
@@ -834,7 +1604,7 @@ endif()
 
 # Set the so version of the lib.
 # Equivalent to LDFLAGS=-version-info x:x:x
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
        foreach(lib ${LWS_LIBRARIES})
                set_target_properties(${lib}
                        PROPERTIES
@@ -849,10 +1619,10 @@ set(LIB_LIST)
 #
 
 #
-# ZLIB (Only needed for deflate extensions).
+# ZLIB (needed for deflate extension and if LWS_WITH_HTTP_STREAM_COMPRESSION)
 #
 if (LWS_WITH_ZLIB)
-       if (LWS_USE_BUNDLED_ZLIB)
+       if (LWS_WITH_BUNDLED_ZLIB)
                if (WIN32)
                        set(WIN32_ZLIB_PATH "win32port/zlib")
                        set(ZLIB_SRCS
@@ -860,8 +1630,6 @@ if (LWS_WITH_ZLIB)
                                ${WIN32_ZLIB_PATH}/compress.c
                                ${WIN32_ZLIB_PATH}/crc32.c
                                ${WIN32_ZLIB_PATH}/deflate.c
-                               ${WIN32_ZLIB_PATH}/gzclose.c
-                               ${WIN32_ZLIB_PATH}/gzio.c
                                ${WIN32_ZLIB_PATH}/gzlib.c
                                ${WIN32_ZLIB_PATH}/gzread.c
                                ${WIN32_ZLIB_PATH}/gzwrite.c
@@ -884,21 +1652,31 @@ if (LWS_WITH_ZLIB)
                        message(FATAL_ERROR "Don't have bundled zlib for that platform")
                endif()
        elseif (NOT ZLIB_FOUND)
-               find_package(ZLIB REQUIRED)
+               if (LWS_WITH_MINIZ)
+                       find_package(Miniz REQUIRED)
+                       set(ZLIB_INCLUDE_DIRS ${MINIZ_INCLUDE_DIRS})
+                       set(ZLIB_LIBRARIES ${MINIZ_LIBRARIES})
+               else()
+                       find_package(ZLIB REQUIRED)
+               endif()
        endif()
-       message("zlib include dirs: ${ZLIB_INCLUDE_DIRS}")
-       message("zlib libraries: ${ZLIB_LIBRARIES}")
+       message("zlib/miniz include dirs: ${ZLIB_INCLUDE_DIRS}")
+       message("zlib/miniz libraries: ${ZLIB_LIBRARIES}")
        include_directories(${ZLIB_INCLUDE_DIRS})
        list(APPEND LIB_LIST ${ZLIB_LIBRARIES})
 endif()
 
+if (LWS_WITH_HTTP_BROTLI)
+       list(APPEND LIB_LIST brotlienc brotlidec brotlidec)
+endif()
+
 #
 # OpenSSL
 #
 if (LWS_WITH_SSL)
        message("Compiling with SSL support")
        set(chose_ssl 0)
-       if (LWS_USE_WOLFSSL)
+       if (LWS_WITH_WOLFSSL)
                # Use wolfSSL as OpenSSL replacement.
                # TODO: Add a find_package command for this also.
                message("wolfSSL include dir: ${WOLFSSL_INCLUDE_DIRS}")
@@ -908,7 +1686,7 @@ if (LWS_WITH_SSL)
                # the wolfssl/ subdirectory which contains the OpenSSL
                # compatibility layer headers.
 
-               if (LWS_USE_CYASSL)
+               if (LWS_WITH_CYASSL)
                        foreach(inc ${WOLFSSL_INCLUDE_DIRS})
                                include_directories("${inc}" "${inc}/cyassl")
                        endforeach()
@@ -922,8 +1700,20 @@ if (LWS_WITH_SSL)
                set(chose_ssl 1)
        endif()
 
+       if (LWS_WITH_MBEDTLS)
+               message("MBEDTLS include dir: ${MBEDTLS_INCLUDE_DIRS}")
+               message("MBEDTLS libraries: ${MBEDTLS_LIBRARIES}")
+
+               foreach(inc ${MBEDTLS_INCLUDE_DIRS})
+                       include_directories("${inc}" "${inc}/mbedtls")
+               endforeach()
+
+               list(APPEND LIB_LIST "${MBEDTLS_LIBRARIES}")
+               set(chose_ssl 1)
+       endif()
+
        if (NOT chose_ssl)
-               if (NOT OPENSSL_FOUND AND NOT LWS_USE_BORINGSSL)
+               if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL)
                        # TODO: Add support for STATIC also.
                if (NOT LWS_WITH_ESP32)
                        find_package(OpenSSL REQUIRED)
@@ -941,13 +1731,17 @@ if (LWS_WITH_SSL)
                        list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
                endif()
 
-       # older (0.98) Openssl lacks this
-       set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
-       check_include_file(openssl/ecdh.h LWS_HAVE_OPENSSL_ECDH_H)
+       if (NOT LWS_WITH_MBEDTLS)
+               # older (0.98) Openssl lacks this
+               set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
+               check_include_file(openssl/ecdh.h LWS_HAVE_OPENSSL_ECDH_H)
 
-       if (LWS_SSL_SERVER_WITH_ECDH_CERT AND NOT LWS_HAVE_OPENSSL_ECDH_H)
-               message(FATAL_ERROR "Missing openssl/ecdh.h, so cannot use LWS_SSL_SERVER_WITH_ECDH_CERT")
-       endif()
+               if (LWS_SSL_SERVER_WITH_ECDH_CERT AND NOT LWS_HAVE_OPENSSL_ECDH_H)
+                       message(FATAL_ERROR "Missing openssl/ecdh.h, so cannot use LWS_SSL_SERVER_WITH_ECDH_CERT")
+               endif()
+       else()
+               unset(LWS_HAVE_OPENSSL_ECDH_H)
+       endif(NOT LWS_WITH_MBEDTLS)
        endif()
 
 endif(LWS_WITH_SSL)
@@ -1009,11 +1803,18 @@ if (LWS_WITH_SQLITE3)
 endif()
 
 
-if (LWS_WITH_HTTP_PROXY)
+if (LWS_WITH_HUBBUB)
        find_library(LIBHUBBUB_LIBRARIES NAMES hubbub)
        list(APPEND LIB_LIST ${LIBHUBBUB_LIBRARIES} )
 endif()
 
+if (LWS_ROLE_DBUS)
+       message("dbus include dir 1: ${LWS_DBUS_INCLUDE1}")
+       message("dbus include dir 2: ${LWS_DBUS_INCLUDE2}")
+       include_directories("${LWS_DBUS_INCLUDE1}")
+       include_directories("${LWS_DBUS_INCLUDE2}")
+       list(APPEND LIB_LIST ${LWS_DBUS_LIB})
+endif()
 
 #
 # Platform specific libs.
@@ -1024,15 +1825,25 @@ elseif (WIN32)
        list(APPEND LIB_LIST ws2_32.lib userenv.lib psapi.lib iphlpapi.lib)
 endif()
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "QNX")
+       list(APPEND LIB_LIST socket)
+endif()
+
 if (UNIX)
        list(APPEND LIB_LIST m)
 endif()
 
-if (LWS_HAVE_LIBCAP)
-       list(APPEND LIB_LIST cap )
+if(SMARTOS)
+       list(APPEND LIB_LIST socket)
 endif()
 
+if (HAIKU)
+       list(APPEND LIB_LIST network)
+endif()
 
+if (LWS_HAVE_LIBCAP)
+       list(APPEND LIB_LIST cap )
+endif()
 
 # Setup the linking for all libs.
 foreach (lib ${LWS_LIBRARIES})
@@ -1041,29 +1852,89 @@ endforeach()
 
 set (temp ${CMAKE_REQUIRED_LIBRARIES})
 set(CMAKE_REQUIRED_LIBRARIES ${LIB_LIST})
+
+if (LWS_WITH_ZLIB)
+       if (LWS_WITH_BUNDLED_ZLIB)
+               if (WIN32)
+                       # it's trying to delete internal zlib entry
+                       LIST(REMOVE_AT CMAKE_REQUIRED_LIBRARIES 0 )
+               endif()
+       endif()
+endif()
+
 CHECK_FUNCTION_EXISTS(SSL_CTX_set1_param LWS_HAVE_SSL_CTX_set1_param)
 CHECK_FUNCTION_EXISTS(SSL_set_info_callback LWS_HAVE_SSL_SET_INFO_CALLBACK)
 CHECK_FUNCTION_EXISTS(X509_VERIFY_PARAM_set1_host LWS_HAVE_X509_VERIFY_PARAM_set1_host)
-if (LWS_WITH_ESP32)
+CHECK_FUNCTION_EXISTS(RSA_set0_key LWS_HAVE_RSA_SET0_KEY)
+CHECK_FUNCTION_EXISTS(X509_get_key_usage LWS_HAVE_X509_get_key_usage)
+CHECK_FUNCTION_EXISTS(EVP_PKEY_new_raw_private_key LWS_HAVE_SSL_CTX_EVP_PKEY_new_raw_private_key)
+CHECK_FUNCTION_EXISTS(SSL_CTX_get0_certificate LWS_HAVE_SSL_CTX_get0_certificate)
+CHECK_FUNCTION_EXISTS(SSL_get0_alpn_selected LWS_HAVE_SSL_get0_alpn_selected)
+CHECK_FUNCTION_EXISTS(SSL_set_alpn_protos LWS_HAVE_SSL_set_alpn_protos)
+CHECK_FUNCTION_EXISTS(EVP_aes_128_cfb8 LWS_HAVE_EVP_aes_128_cfb8)
+CHECK_FUNCTION_EXISTS(EVP_aes_128_cfb128 LWS_HAVE_EVP_aes_128_cfb128)
+CHECK_FUNCTION_EXISTS(EVP_aes_192_cfb8 LWS_HAVE_EVP_aes_192_cfb8)
+CHECK_FUNCTION_EXISTS(EVP_aes_192_cfb128 LWS_HAVE_EVP_aes_192_cfb128)
+CHECK_FUNCTION_EXISTS(EVP_aes_256_cfb8 LWS_HAVE_EVP_aes_256_cfb8)
+CHECK_FUNCTION_EXISTS(EVP_aes_256_cfb128 LWS_HAVE_EVP_aes_256_cfb128)
+CHECK_FUNCTION_EXISTS(EVP_aes_128_xts LWS_HAVE_EVP_aes_128_xts)
+CHECK_FUNCTION_EXISTS(RSA_verify_pss_mgf1 LWS_HAVE_RSA_verify_pss_mgf1)
+CHECK_FUNCTION_EXISTS(HMAC_CTX_new LWS_HAVE_HMAC_CTX_new)
+CHECK_FUNCTION_EXISTS(SSL_CTX_set_ciphersuites LWS_HAVE_SSL_CTX_set_ciphersuites)
+if (LWS_WITH_SSL AND NOT LWS_WITH_MBEDTLS)
+ if (UNIX)
+ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dl)
+ endif()
+CHECK_C_SOURCE_COMPILES("#include <openssl/ssl.h>\nint main(void) { STACK_OF(X509) *c = NULL; SSL_CTX *ctx = NULL; return (int)SSL_CTX_get_extra_chain_certs_only(ctx, &c); }\n" LWS_HAVE_SSL_EXTRA_CHAIN_CERTS)
+CHECK_C_SOURCE_COMPILES("#include <openssl/ssl.h>\nint main(void) { EVP_MD_CTX *md_ctx = NULL; EVP_MD_CTX_free(md_ctx); return 0; }\n" LWS_HAVE_EVP_MD_CTX_free)
+CHECK_FUNCTION_EXISTS(ECDSA_SIG_set0 LWS_HAVE_ECDSA_SIG_set0)
+CHECK_FUNCTION_EXISTS(BN_bn2binpad LWS_HAVE_BN_bn2binpad)
+CHECK_FUNCTION_EXISTS(EVP_aes_128_wrap LWS_HAVE_EVP_aes_128_wrap)
+CHECK_FUNCTION_EXISTS(EC_POINT_get_affine_coordinates LWS_HAVE_EC_POINT_get_affine_coordinates)
+endif()
+if (LWS_WITH_MBEDTLS)
        set(LWS_HAVE_TLS_CLIENT_METHOD 1)
+       if (NOT LWS_WITH_ESP32)
+               # not supported in esp-idf openssl wrapper yet, but is in our version
+               set(LWS_HAVE_X509_VERIFY_PARAM_set1_host 1)
+       endif()
+
+       CHECK_FUNCTION_EXISTS(mbedtls_ssl_conf_alpn_protocols LWS_HAVE_mbedtls_ssl_conf_alpn_protocols)
+       CHECK_FUNCTION_EXISTS(mbedtls_ssl_get_alpn_protocol LWS_HAVE_mbedtls_ssl_get_alpn_protocol)
+       CHECK_FUNCTION_EXISTS(mbedtls_ssl_conf_sni LWS_HAVE_mbedtls_ssl_conf_sni)
+       CHECK_FUNCTION_EXISTS(mbedtls_ssl_set_hs_ca_chain LWS_HAVE_mbedtls_ssl_set_hs_ca_chain)
+       CHECK_FUNCTION_EXISTS(mbedtls_ssl_set_hs_own_cert LWS_HAVE_mbedtls_ssl_set_hs_own_cert)
+       CHECK_FUNCTION_EXISTS(mbedtls_ssl_set_hs_authmode LWS_HAVE_mbedtls_ssl_set_hs_authmode)
+       CHECK_FUNCTION_EXISTS(mbedtls_net_init LWS_HAVE_mbedtls_net_init)
+
 else()
 CHECK_FUNCTION_EXISTS(TLS_client_method LWS_HAVE_TLS_CLIENT_METHOD)
 CHECK_FUNCTION_EXISTS(TLSv1_2_client_method LWS_HAVE_TLSV1_2_CLIENT_METHOD)
 endif()
+
+# ideally we want to use pipe2()
+
+CHECK_C_SOURCE_COMPILES("#define _GNU_SOURCE\n#include <unistd.h>\nint main(void) {int fd[2];\n return pipe2(fd, 0);\n}\n" LWS_HAVE_PIPE2)
+
+# tcp keepalive needs this on linux to work practically... but it only exists
+# after kernel 2.6.37
+
+CHECK_C_SOURCE_COMPILES("#include <netinet/tcp.h>\nint main(void) { return TCP_USER_TIMEOUT; }\n" LWS_HAVE_TCP_USER_TIMEOUT)
+
 set(CMAKE_REQUIRED_LIBRARIES ${temp})
 # Generate the lws_config.h that includes all the public compilation settings.
 configure_file(
-       "${PROJECT_SOURCE_DIR}/lws_config.h.in"
+       "${PROJECT_SOURCE_DIR}/cmake/lws_config.h.in"
        "${PROJECT_BINARY_DIR}/lws_config.h")
 
 # Generate the lws_config.h that includes all the private compilation settings.
 configure_file(
-       "${PROJECT_SOURCE_DIR}/lws_config_private.h.in"
+       "${PROJECT_SOURCE_DIR}/cmake/lws_config_private.h.in"
        "${PROJECT_BINARY_DIR}/lws_config_private.h")
 
 # Generate self-signed SSL certs for the test-server.
 
-if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
+if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL)
        message("Searching for OpenSSL executable and dlls")
        find_package(OpenSSLbins)
        message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
@@ -1078,7 +1949,7 @@ endif()
 
 set(GENCERTS 0)
 
-if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER)
+if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER AND NOT LWS_WITHOUT_SERVER AND NOT LWS_WITHOUT_TESTAPPS)
        set(GENCERTS 1)
 endif()
 if (LWS_WITH_ESP32)
@@ -1155,7 +2026,7 @@ endif()
 # Test applications
 #
 set(TEST_APP_LIST)
-if (NOT LWS_WITHOUT_TESTAPPS)
+if ((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_TESTAPPS)
        #
        # Helper function for adding a test app.
        #
@@ -1212,6 +2083,13 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                        endif()
                        target_link_libraries(${TEST_NAME} websockets)
                        add_dependencies(${TEST_NAME} websockets)
+                       if (UNIX AND LWS_WITH_SSL AND NOT LWS_WITH_MBEDTLS)
+                               target_link_libraries(${TEST_NAME} dl)
+                       endif()
+               endif()
+
+               if (LWS_WITH_HTTP_STREAM_COMPRESSION)
+                       target_link_libraries(${TEST_NAME} z)
                endif()
 
                # Set test app specific defines.
@@ -1231,12 +2109,15 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 
        if (UNIX AND LWS_WITH_PLUGINS)
                set(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
-               if(NOT(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"))
+               if(NOT((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") OR (${CMAKE_SYSTEM_NAME} MATCHES "QNX")))
                        target_link_libraries(websockets dl)
                endif()
        endif()
 
-
+       if (LWS_WITH_LIBEV)
+               # libev generates a big mess of warnings with gcc, maintainer claims gcc to blame
+               set_source_files_properties( lib/event-libs/libev/libev.c PROPERTIES COMPILE_FLAGS "-Wno-error" )
+       endif()
 
 
        if (NOT LWS_WITHOUT_SERVER)
@@ -1244,70 +2125,34 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                # test-server
                #
                if (NOT LWS_WITHOUT_TEST_SERVER)
-                       create_test_app(test-server "test-server/test-server.c"
-                               "test-server/test-server-http.c"
-                               "test-server/test-server-dumb-increment.c"
+                       create_test_app(test-server "test-apps/test-server.c"
+                               ""
+                               ""
                                ""
                                ""
                                "")
-                       if (UNIX)
-                               create_test_app(test-fuzxy "test-server/fuzxy.c"
-                                       ""
-                                       ""
-                                       ""
-                                       ""
-                                       "")
-                       endif()
-                       if (UNIX AND NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND LWS_MAX_SMP GREATER 1)
-                               create_test_app(test-server-pthreads
-                                       "test-server/test-server-pthreads.c"
-                                       "test-server/test-server-http.c"
-                                       "test-server/test-server-dumb-increment.c"
-                                       ""
-                                       ""
-                                       "")
-                       endif()
-                       if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-                               AND LWS_WITH_LIBEV)
-                               create_test_app(test-server-libev
-                                       "test-server/test-server-libev.c"
-                                       "test-server/test-server-http.c"
-                                       "test-server/test-server-dumb-increment.c"
-                                       ""
-                                       ""
-                                       "")
-                               # libev generates a big mess of warnings with gcc, maintainers blame gcc
-                               set_source_files_properties( test-server/test-server-libev.c PROPERTIES COMPILE_FLAGS "-Wno-error" )
-                       endif()
-                       if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-                               AND LWS_WITH_LIBUV)
-                               create_test_app(test-server-libuv
-                                       "test-server/test-server-libuv.c"
-                                       "test-server/test-server-http.c"
-                                       ""
-                                       ""
-                                       ""
-                                       "")
-                       endif()
-                       if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-                               AND LWS_WITH_LIBEVENT)
-                               create_test_app(test-server-libevent
-                                       "test-server/test-server-libevent.c"
-                                       "test-server/test-server-http.c"
-                                       "test-server/test-server-dumb-increment.c"
-                                       ""
-                                       ""
-                                       "")
+
+                       if (LWS_WITH_CGI)
+                       create_test_app(test-sshd "test-apps/test-sshd.c"
+                               ""
+                               ""
+                               ""
+                               ""
+                               "")
+                       target_include_directories(test-sshd PRIVATE "${PROJECT_SOURCE_DIR}/plugins/ssh-base/include")
+
                        endif()
+
                endif()
 
                #
                # test-server-extpoll
                #
-               if (NOT LWS_WITHOUT_TEST_SERVER_EXTPOLL)
-                       create_test_app(test-server-extpoll "test-server/test-server.c"
-                               "test-server/test-server-http.c"
-                               "test-server/test-server-dumb-increment.c"
+               if (NOT LWS_WITHOUT_TEST_SERVER_EXTPOLL AND NOT WIN32)
+                       create_test_app(test-server-extpoll
+                               "test-apps/test-server.c"
+                               ""
+                               ""
                                ""
                                ""
                                "")
@@ -1325,13 +2170,10 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                        endif(WIN32)
                endif()
 
-               #
-               # test-server-v2.0
-               #
-               if (LWS_WITH_PLUGINS)
+               if (LWS_WITH_LEJP)
                        create_test_app(
-                               test-server-v2.0
-                               "test-server/test-server-v2.0.c"
+                               test-lejp
+                               "test-apps/test-lejp.c"
                                ""
                                ""
                                ""
@@ -1340,13 +2182,17 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                endif()
 
                # Data files for running the test server.
-               set(TEST_SERVER_DATA
-                       "${PROJECT_SOURCE_DIR}/test-server/favicon.ico"
-                       "${PROJECT_SOURCE_DIR}/test-server/leaf.jpg"
-                       "${PROJECT_SOURCE_DIR}/test-server/candide.zip"
-                       "${PROJECT_SOURCE_DIR}/test-server/libwebsockets.org-logo.png"
-                       "${PROJECT_SOURCE_DIR}/test-server/lws-common.js"
-                       "${PROJECT_SOURCE_DIR}/test-server/test.html")
+               list(APPEND TEST_SERVER_DATA
+                       "${PROJECT_SOURCE_DIR}/test-apps/favicon.ico"
+                       "${PROJECT_SOURCE_DIR}/test-apps/leaf.jpg"
+                       "${PROJECT_SOURCE_DIR}/test-apps/candide.zip"
+                       "${PROJECT_SOURCE_DIR}/test-apps/libwebsockets.org-logo.svg"
+                       "${PROJECT_SOURCE_DIR}/test-apps/http2.png"
+                       "${PROJECT_SOURCE_DIR}/test-apps/wss-over-h2.png"
+                       "${PROJECT_SOURCE_DIR}/test-apps/lws-common.js"
+                       "${PROJECT_SOURCE_DIR}/test-apps/test.html"
+                       "${PROJECT_SOURCE_DIR}/test-apps/test.css"
+                       "${PROJECT_SOURCE_DIR}/test-apps/test.js")
 
                add_custom_command(TARGET test-server
                                                POST_BUILD 
@@ -1368,34 +2214,14 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                # test-client
                #
                if (NOT LWS_WITHOUT_TEST_CLIENT)
-                       create_test_app(test-client "test-server/test-client.c" "" "" "" "" "")
-               endif()
-
-               #
-               # test-fraggle
-               #
-               if (NOT LWS_WITHOUT_TEST_FRAGGLE)
-                       create_test_app(test-fraggle "test-server/test-fraggle.c" "" "" "" "" "")
-               endif()
-
-               #
-               # test-ping
-               #
-               if (NOT LWS_WITHOUT_TEST_PING)
-                       create_test_app(test-ping "test-server/test-ping.c" "" "" "" "" "")
-               endif()
-               #
-               # test-echo
-               #
-               if (NOT LWS_WITHOUT_TEST_ECHO)
-                       create_test_app(test-echo "test-server/test-echo.c" "" "" "" "" "")
+                       create_test_app(test-client "test-apps/test-client.c" "" "" "" "" "")
                endif()
 
        endif(NOT LWS_WITHOUT_CLIENT)
        
        
        if (LWS_WITH_PLUGINS AND LWS_WITH_SHARED)
-               macro(create_plugin PLUGIN_NAME MAIN_SRC S2 S3)
+               macro(create_plugin PLUGIN_NAME PLUGIN_INCLUDE MAIN_SRC S2 S3)
 
                set(PLUGIN_SRCS ${MAIN_SRC})
 
@@ -1427,6 +2253,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                
                target_link_libraries(${PLUGIN_NAME} websockets_shared)
                add_dependencies(${PLUGIN_NAME} websockets_shared)
+               include_directories(${PLUGIN_INCLUDE})
 
                # Set test app specific defines.
                set_property(TARGET ${PLUGIN_NAME}
@@ -1434,6 +2261,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                             INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/plugins"
                )
 
+               SET_TARGET_PROPERTIES(${PLUGIN_NAME}
+                               PROPERTIES COMPILE_FLAGS ${CMAKE_C_FLAGS})
+
 #              set_target_properties(${PLUGIN_NAME}
 #                      PROPERTIES
 #                      OUTPUT_NAME ${PLUGIN_NAME})
@@ -1442,36 +2272,67 @@ if (NOT LWS_WITHOUT_TESTAPPS)
 
                endmacro()
                
-
-               create_plugin(protocol_lws_meta
-                             "plugins/protocol_lws_meta.c" "" "")
-               create_plugin(protocol_dumb_increment
+if (LWS_ROLE_WS)
+               create_plugin(protocol_dumb_increment ""
                              "plugins/protocol_dumb_increment.c" "" "")
-               create_plugin(protocol_lws_mirror
+               create_plugin(protocol_lws_mirror ""
                              "plugins/protocol_lws_mirror.c" "" "")
-               create_plugin(protocol_lws_status
+               create_plugin(protocol_lws_status ""
                              "plugins/protocol_lws_status.c" "" "")
-               create_plugin(protocol_post_demo
-                             "plugins/protocol_post_demo.c" "" "")
-               create_plugin(protocol_lws_table_dirlisting
+               create_plugin(protocol_lws_table_dirlisting ""
                              "plugins/generic-table/protocol_table_dirlisting.c" "" "")
                if (NOT WIN32)
-                     create_plugin(protocol_lws_raw_test
+                       create_plugin(protocol_lws_raw_test ""
                              "plugins/protocol_lws_raw_test.c" "" "")
+
+                       create_plugin(protocol_deaddrop ""
+                             "plugins/deaddrop/protocol_lws_deaddrop.c" "" "")
+
                endif()
 
 if (LWS_WITH_SERVER_STATUS)
-               create_plugin(protocol_lws_server_status
+               create_plugin(protocol_lws_server_status ""
                              "plugins/protocol_lws_server_status.c" "" "")
 endif()
 
 if (NOT LWS_WITHOUT_CLIENT)
-               create_plugin(protocol_client_loopback_test
+               create_plugin(protocol_client_loopback_test ""
                               "plugins/protocol_client_loopback_test.c" "" "")
-endif(NOT LWS_WITHOUT_CLIENT)
+endif()
 
-if (LWS_WITH_GENERIC_SESSIONS)
-       create_plugin(protocol_generic_sessions
+endif()
+
+               create_plugin(protocol_post_demo ""
+                             "plugins/protocol_post_demo.c" "" "")
+
+if (LWS_ROLE_RAW_PROXY)
+               create_plugin(protocol_lws_raw_proxy ""
+                             "plugins/raw-proxy/protocol_lws_raw_proxy.c" "" "")
+endif()
+
+if (LWS_WITH_FTS)
+               create_plugin(protocol_fulltext_demo ""
+                             "plugins/protocol_fulltext_demo.c" "" "")
+endif()
+
+
+if (LWS_WITH_SSL)
+               create_plugin(protocol_lws_ssh_base "plugins/ssh-base/include"
+                             "plugins/ssh-base/sshd.c;plugins/ssh-base/telnet.c;plugins/ssh-base/kex-25519.c" "plugins/ssh-base/crypto/chacha.c;plugins/ssh-base/crypto/ed25519.c;plugins/ssh-base/crypto/fe25519.c;plugins/ssh-base/crypto/ge25519.c;plugins/ssh-base/crypto/poly1305.c;plugins/ssh-base/crypto/sc25519.c;plugins/ssh-base/crypto/smult_curve25519_ref.c" "")
+               create_plugin(protocol_lws_sshd_demo "plugins/ssh-base/include" "plugins/protocol_lws_sshd_demo.c" "" "")
+
+               include_directories("${PROJECT_SOURCE_DIR}/plugins/ssh-base/include")
+endif()
+
+
+
+if (LWS_WITH_ACME)
+               create_plugin(protocol_lws_acme_client ""
+                             "plugins/acme-client/protocol_lws_acme_client.c" "" "")
+endif()
+
+if (LWS_WITH_GENERIC_SESSIONS AND LWS_ROLE_WS)
+       create_plugin(protocol_generic_sessions ""
                       "plugins/generic-sessions/protocol_generic_sessions.c"
                      "plugins/generic-sessions/utils.c"
                      "plugins/generic-sessions/handlers.c")
@@ -1482,7 +2343,7 @@ if (LWS_WITH_GENERIC_SESSIONS)
                target_link_libraries(protocol_generic_sessions sqlite3 )
        endif(WIN32)
 
-               create_plugin(protocol_lws_messageboard
+               create_plugin(protocol_lws_messageboard ""
                              "plugins/generic-sessions/protocol_lws_messageboard.c" "" "")
        if (WIN32)
                target_link_libraries(protocol_lws_messageboard ${LWS_SQLITE3_LIBRARIES})
@@ -1490,7 +2351,7 @@ if (LWS_WITH_GENERIC_SESSIONS)
                target_link_libraries(protocol_lws_messageboard sqlite3 )
        endif(WIN32)
 
-endif(LWS_WITH_GENERIC_SESSIONS)
+endif(LWS_WITH_GENERIC_SESSIONS AND LWS_ROLE_WS)
 
 
        endif(LWS_WITH_PLUGINS AND LWS_WITH_SHARED)
@@ -1499,7 +2360,7 @@ endif(LWS_WITH_GENERIC_SESSIONS)
        # Copy OpenSSL dlls to the output directory on Windows.
        # (Otherwise we'll get an error when trying to run)
        #
-       if (WIN32 AND LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
+       if (WIN32 AND LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL)
                if(OPENSSL_BIN_FOUND)
                        message("OpenSSL dlls found:")
                        message("  Libeay: ${LIBEAY_BIN}")
@@ -1512,10 +2373,20 @@ endif(LWS_WITH_GENERIC_SESSIONS)
                                add_custom_command(TARGET ${TARGET_BIN}
                                        POST_BUILD
                                        COMMAND "${CMAKE_COMMAND}" -E copy "${SSLEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
+
+                               #
+                               # Win32: if we are using libuv, also need to copy it in the output dir
+                               #
+                               if (WIN32 AND LWS_WITH_LIBUV)
+                                       STRING(REPLACE ".lib" ".dll" LIBUV_BIN ${LIBUV_LIBRARIES})
+                                       add_custom_command(TARGET ${TARGET_BIN}
+                                               POST_BUILD
+                                               COMMAND "${CMAKE_COMMAND}" -E copy "${LIBUV_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
+                               endif()
                        endforeach()
                endif()
        endif()
-endif(NOT LWS_WITHOUT_TESTAPPS)
+endif((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_TESTAPPS)
 
 if (LWS_WITH_LWSWS)
                list(APPEND LWSWS_SRCS
@@ -1606,8 +2477,11 @@ endif()
 set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
 
 # Export targets (This is used for other CMake projects to easily find the libraries and include files).
-export(TARGETS ${LWS_LIBRARIES}
-        FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
+if (LWS_WITH_EXPORT_LWSTARGETS)
+    export(TARGETS ${LWS_LIBRARIES}
+            FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
+endif()
+
 export(PACKAGE libwebsockets)
 
 # Generate the config file for the build-tree.
@@ -1649,6 +2523,9 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfigVersion.cmake.in
 # Installation.
 #
 
+install(DIRECTORY include/libwebsockets
+       DESTINATION "${LWS_INSTALL_INCLUDE_DIR}" COMPONENT dev_headers)
+
 # Install libs and headers.
 install(TARGETS ${LWS_LIBRARIES}
                EXPORT LibwebsocketsTargets
@@ -1656,6 +2533,7 @@ install(TARGETS ${LWS_LIBRARIES}
                ARCHIVE DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries
                RUNTIME DESTINATION "${LWS_INSTALL_BIN_DIR}" COMPONENT libraries # Windows DLLs
                PUBLIC_HEADER DESTINATION "${LWS_INSTALL_INCLUDE_DIR}" COMPONENT dev)
+               
 set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
 set(CPACK_COMPONENT_DEV_DISPLAY_NAME "Development files")
 
@@ -1679,11 +2557,11 @@ if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_SERVER)
                        DESTINATION share/libwebsockets-test-server
                COMPONENT examples)
 
-               install(FILES "${PROJECT_SOURCE_DIR}/test-server/private/index.html"
+               install(FILES "${PROJECT_SOURCE_DIR}/test-apps/private/index.html"
                        DESTINATION share/libwebsockets-test-server/private
                        COMPONENT examples)
 if (LWS_WITH_CGI)
-       set(CGI_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/test-server/lws-cgi-test.sh")
+       set(CGI_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/test-apps/lws-cgi-test.sh")
        install(FILES ${CGI_TEST_SCRIPT}
                        PERMISSIONS  OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ
                        DESTINATION share/libwebsockets-test-server
@@ -1691,6 +2569,13 @@ if (LWS_WITH_CGI)
        endif()
 endif()
 
+
+if (NOT LWS_WITHOUT_TEST_SERVER AND NOT LWS_WITHOUT_SERVER AND NOT LWS_WITHOUT_TESTAPPS)
+       install(FILES test-apps/lws-ssh-test-keys;test-apps/lws-ssh-test-keys.pub
+               DESTINATION share/libwebsockets-test-server
+               COMPONENT examples)
+endif()
+
 # plugins
 
 if (LWS_WITH_PLUGINS)
@@ -1698,8 +2583,16 @@ if (LWS_WITH_PLUGINS)
                PERMISSIONS  OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ
                DESTINATION share/libwebsockets-test-server/plugins
                COMPONENT plugins)
+
+       if (NOT WIN32)
+               install(FILES plugins/deaddrop/assets/index.html;plugins/deaddrop/assets/deaddrop.js;plugins/deaddrop/assets/deaddrop.css;plugins/deaddrop/assets/drop.svg
+                       DESTINATION share/libwebsockets-test-server/deaddrop
+                       COMPONENT plugins)
+       endif()
+
+
 if (LWS_WITH_SERVER_STATUS)
-       install(FILES plugins/server-status.html;plugins/lwsws-logo.png
+       install(FILES plugins/server-status.html;plugins/server-status.js;plugins/server-status.css;plugins/lwsws-logo.png
                DESTINATION share/libwebsockets-test-server/server-status
                        COMPONENT examples)
 endif()
@@ -1709,6 +2602,7 @@ if (LWS_WITH_GENERIC_SESSIONS)
                      plugins/generic-sessions/assets/seats.jpg
                      plugins/generic-sessions/assets/failed-login.html
                      plugins/generic-sessions/assets/lwsgs.js
+                     plugins/generic-sessions/assets/lwsgs.css
                      plugins/generic-sessions/assets/post-register-fail.html
                      plugins/generic-sessions/assets/post-register-ok.html
                      plugins/generic-sessions/assets/post-verify-ok.html
@@ -1743,18 +2637,20 @@ install(FILES
                DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev)
 
 # Install exports for the install-tree.
-install(EXPORT LibwebsocketsTargets
-               DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev)
+if (LWS_WITH_EXPORT_LWSTARGETS)
+    install(EXPORT LibwebsocketsTargets
+            DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev)
+endif()
 
 # build subdir is not part of sources
-set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) ".git" "build" "tgz" "tar.gz")
+set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) "/.git/" "/build/" "\\\\.tgz$" "\\\\.tar\\\\.gz$")
 
 # Most people are more used to "make dist" compared to "make package_source"
 add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source)
 
 include(UseRPMTools)
 if (RPMTools_FOUND)
-       RPMTools_ADD_RPM_TARGETS(libwebsockets libwebsockets.spec)
+       RPMTools_ADD_RPM_TARGETS(libwebsockets scripts/libwebsockets.spec)
 endif()
 
 message("---------------------------------------------------------------------")
@@ -1764,11 +2660,12 @@ message(" LWS_WITH_STATIC = ${LWS_WITH_STATIC}")
 message(" LWS_WITH_SHARED = ${LWS_WITH_SHARED}")
 message(" LWS_WITH_SSL = ${LWS_WITH_SSL} (SSL Support)")
 message(" LWS_SSL_CLIENT_USE_OS_CA_CERTS = ${LWS_SSL_CLIENT_USE_OS_CA_CERTS}")
-message(" LWS_USE_WOLFSSL = ${LWS_USE_WOLFSSL} (wolfSSL/CyaSSL replacement for OpenSSL)")
-if (LWS_USE_WOLFSSL)
+message(" LWS_WITH_WOLFSSL = ${LWS_WITH_WOLFSSL} (wolfSSL/CyaSSL replacement for OpenSSL)")
+if (LWS_WITH_WOLFSSL)
        message("   LWS_WOLFSSL_LIBRARIES = ${LWS_WOLFSSL_LIBRARIES}")
        message("   LWS_WOLFSSL_INCLUDE_DIRS = ${LWS_WOLFSSL_INCLUDE_DIRS}")
 endif()
+message(" LWS_WITH_MBEDTLS = ${LWS_WITH_MBEDTLS} (mbedTLS replacement for OpenSSL)")
 message(" LWS_WITHOUT_BUILTIN_SHA1 = ${LWS_WITHOUT_BUILTIN_SHA1}")
 message(" LWS_WITHOUT_BUILTIN_GETIFADDRS = ${LWS_WITHOUT_BUILTIN_GETIFADDRS}")
 message(" LWS_WITHOUT_CLIENT = ${LWS_WITHOUT_CLIENT}")
@@ -1778,23 +2675,23 @@ message(" LWS_WITHOUT_TESTAPPS = ${LWS_WITHOUT_TESTAPPS}")
 message(" LWS_WITHOUT_TEST_SERVER = ${LWS_WITHOUT_TEST_SERVER}")
 message(" LWS_WITHOUT_TEST_SERVER_EXTPOLL = ${LWS_WITHOUT_TEST_SERVER_EXTPOLL}")
 message(" LWS_WITHOUT_TEST_PING = ${LWS_WITHOUT_TEST_PING}")
-message(" LWS_WITHOUT_TEST_ECHO = ${LWS_WITHOUT_TEST_ECHO}")
 message(" LWS_WITHOUT_TEST_CLIENT = ${LWS_WITHOUT_TEST_CLIENT}")
-message(" LWS_WITHOUT_TEST_FRAGGLE = ${LWS_WITHOUT_TEST_FRAGGLE}")
 message(" LWS_WITHOUT_EXTENSIONS = ${LWS_WITHOUT_EXTENSIONS}")
 message(" LWS_WITH_LATENCY = ${LWS_WITH_LATENCY}")
 message(" LWS_WITHOUT_DAEMONIZE = ${LWS_WITHOUT_DAEMONIZE}")
-message(" LWS_USE_LIBEV = ${LWS_USE_LIBEV}")
-message(" LWS_USE_LIBUV = ${LWS_USE_LIBUV}")
-message(" LWS_USE_LIBEVENT = ${LWS_USE_LIBEVENT}")
+message(" LWS_WITH_LIBEV = ${LWS_WITH_LIBEV}")
+message(" LWS_WITH_LIBUV = ${LWS_WITH_LIBUV}")
+message(" LWS_WITH_LIBEVENT = ${LWS_WITH_LIBEVENT}")
 message(" LWS_IPV6 = ${LWS_IPV6}")
 message(" LWS_UNIX_SOCK = ${LWS_UNIX_SOCK}")
 message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
 message(" LWS_SSL_SERVER_WITH_ECDH_CERT = ${LWS_SSL_SERVER_WITH_ECDH_CERT}")
 message(" LWS_MAX_SMP = ${LWS_MAX_SMP}")
+message(" LWS_HAVE_PTHREAD_H = ${LWS_HAVE_PTHREAD_H}")
 message(" LWS_WITH_CGI = ${LWS_WITH_CGI}")
 message(" LWS_HAVE_OPENSSL_ECDH_H = ${LWS_HAVE_OPENSSL_ECDH_H}")
 message(" LWS_HAVE_SSL_CTX_set1_param = ${LWS_HAVE_SSL_CTX_set1_param}")
+message(" LWS_HAVE_RSA_SET0_KEY = ${LWS_HAVE_RSA_SET0_KEY}")
 message(" LWS_WITH_HTTP_PROXY = ${LWS_WITH_HTTP_PROXY}")
 message(" LIBHUBBUB_LIBRARIES = ${LIBHUBBUB_LIBRARIES}")
 message(" PLUGINS = ${PLUGINS_LIST}")
@@ -1814,10 +2711,13 @@ message(" LWS_WITH_STATS = ${LWS_WITH_STATS}")
 message(" LWS_WITH_SOCKS5 = ${LWS_WITH_SOCKS5}")
 message(" LWS_HAVE_SYS_CAPABILITY_H = ${LWS_HAVE_SYS_CAPABILITY_H}")
 message(" LWS_HAVE_LIBCAP = ${LWS_HAVE_LIBCAP}")
+message(" LWS_WITH_PEER_LIMITS = ${LWS_WITH_PEER_LIMITS}")
 message(" LWS_HAVE_ATOLL = ${LWS_HAVE_ATOLL}")
 message(" LWS_HAVE__ATOI64 = ${LWS_HAVE__ATOI64}")
 message(" LWS_HAVE_STAT32I64 = ${LWS_HAVE_STAT32I64}")
 message(" LWS_HAS_INTPTR_T = ${LWS_HAS_INTPTR_T}")
+message(" LWS_WITH_EXPORT_LWSTARGETS = ${LWS_WITH_EXPORT_LWSTARGETS}")
+message(" LWS_WITH_ABSTRACT = ${LWS_WITH_ABSTRACT}")
 
 message("---------------------------------------------------------------------")
 
@@ -1830,5 +2730,32 @@ if (LWS_WITH_SHARED)
        set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library")
 endif()
 
+if (LWS_WITH_MINIMAL_EXAMPLES)
+       MACRO(SUBDIRLIST result curdir)
+         FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
+         SET(dirlist "")
+
+         FOREACH(child ${children})
+           IF(IS_DIRECTORY ${curdir}/${child})
+               LIST(APPEND dirlist ${child})
+           ENDIF()
+         ENDFOREACH()
+
+         SET(${result} ${dirlist})
+       ENDMACRO()
+
+       SUBDIRLIST(SUBDIRS "${PROJECT_SOURCE_DIR}/minimal-examples")
+       FOREACH(subdir ${SUBDIRS})
+
+               SUBDIRLIST(SUBDIRS2 "${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}")
+               FOREACH(subdir2 ${SUBDIRS2})
+                       if (EXISTS "${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}/${subdir2}/CMakeLists.txt")
+                               message("Processing ${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}/${subdir2}")
+                               add_subdirectory("${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}/${subdir2}")
+                       endif()
+               ENDFOREACH()
+       ENDFOREACH()
+ENDIF()
+
 # This must always be last!
 include(CPack)