Fix build error
[platform/upstream/libwebsockets.git] / CMakeLists.txt
index 1c5a0bb..166d48a 100644 (file)
-cmake_minimum_required(VERSION 2.8)
-
-if(NOT DEFINED CMAKE_BUILD_TYPE)
-       set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
-endif()
-
-project(libwebsockets C)
-
-set(PACKAGE "libwebsockets")
-set(CPACK_PACKAGE_NAME "${PACKAGE}")
-set(CPACK_PACKAGE_VERSION_MAJOR "2")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
-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_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "8")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(VERSION "${CPACK_PACKAGE_VERSION}")
+#
+# libwebsockets - small server side websockets and web server implementation
+#
+# Copyright (C) 2010 - 2020 Andy Green <andy@warmcat.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#
 
-set(LWS_LIBRARY_VERSION ${CPACK_PACKAGE_VERSION})
-set(LWS_LIBRARY_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
-set(LWS_LIBRARY_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
-set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
+cmake_minimum_required(VERSION 2.8.12)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(CheckTypeSize)
+include(CheckCSourceCompiles)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
+if (POLICY CMP0048)
+       cmake_policy(SET CMP0048 NEW)
+endif()
 
-message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'")
+#if (POLICY CMP0024)
+#      cmake_policy(SET CMP0024 NEW)
+#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}")
+if (POLICY CMP0075)
+       cmake_policy(SET CMP0075 NEW)
 endif()
 
-set(LWS_USE_BUNDLED_ZLIB_DEFAULT OFF)
+# 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_USE_BUNDLED_ZLIB_DEFAULT ON)
+       set(LWS_WITH_BUNDLED_ZLIB_DEFAULT ON)
 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_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_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_MBED3 "Platform is MBED3" 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" 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)
+set(LWS_ROLE_RAW 1)
+set(LWS_WITH_POLL 1)
 
-if (LWS_WITH_LWSWS)
- message(STATUS "LWS_WITH_LWSWS --> Enabling LWS_WITH_PLUGINS and LWS_WITH_LIBUV")
- set(LWS_WITH_PLUGINS 1)
- set(LWS_WITH_LIBUV 1)
- set(LWS_WITH_ACCESS_LOG 1)
- set(LWS_WITH_SERVER_STATUS 1)
- set(LWS_WITH_LEJP 1)
- set(LWS_WITH_LEJP_CONF 1)
+if (ESP_PLATFORM)
+       set(LWS_ESP_PLATFORM 1)
+       #set(CMAKE_TOOLCHAIN_FILE contrib/cross-esp32.cmake)
+       set(LWIP_PROVIDE_ERRNO 1)
 endif()
 
-if (LWS_WITH_PLUGINS AND NOT LWS_WITH_LIBUV)
-message(STATUS "LWS_WITH_PLUGINS --> Enabling LWS_WITH_LIBUV")
- set(LWS_WITH_LIBUV 1)
-endif()
+# it's at this point any toolchain file is brought in
+project(libwebsockets C)
+if (LWS_WITH_SECURE_STREAMS_CPP)
+       enable_language(CXX)
+endif()
+include(CTest)
+
+if (ESP_PLATFORM)
+       include_directories(
+               $ENV{IDF_PATH}/components/esp_hw_support/include/soc/
+               $ENV{IDF_PATH}/components/freertos/include/
+               $ENV{IDF_PATH}/components/freertos/esp_additions/include/
+               $ENV{IDF_PATH}/components/freertos/esp_additions/include/freertos/
+               $ENV{IDF_PATH}/components/freertos/FreeRTOS-Kernel/include/
+               $ENV{IDF_PATH}/components/freertos/FreeRTOS-Kernel/portable/linux/include/
+               $ENV{IDF_PATH}/components/xtensa/${CONFIG_IDF_TARGET}/include/
+               $ENV{IDF_PATH}/components/freertos/include/esp_additions
+               $ENV{IDF_PATH}/components/hal/include
+               $ENV{IDF_PATH}/components/soc/${CONFIG_IDF_TARGET}/include/
+               $ENV{IDF_PATH}/components/soc/include/
+               $ENV{IDF_PATH}/components/esp_hw_support/include
+               $ENV{IDF_PATH}/components/hal/${CONFIG_IDF_TARGET}/include/
+       )
+
+       if (CONFIG_IDF_TARGET_ARCH_RISCV)
+                include_directories(
+                       $ENV{IDF_PATH}/components/freertos/port/riscv/include
+                       $ENV{IDF_PATH}/components/riscv/include)
+        else()
+                include_directories(
+                       $ENV{IDF_PATH}/components/freertos/port/xtensa/include
+                       $ENV{IDF_PATH}/components/xtensa/include)
+        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_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()
+#
+# 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)
 
-if (DEFINED YOTTA_WEBSOCKETS_VERSION_STRING)
+#
+# Compiler features
+#
+option(DISABLE_WERROR "Avoid treating compiler warnings as fatal errors" 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_MQTT "Build with support for MQTT client" OFF)
+option(LWS_ROLE_DBUS "Compile with support for DBUS" OFF)
+option(LWS_ROLE_RAW_PROXY "Raw packet proxy" OFF)
+option(LWS_ROLE_RAW_FILE "Compile with support for raw files" ON)
+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 if OS supports it" ON)
+option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions (implies LWS_WITH_PLUGINS_API)" OFF)
+option(LWS_WITH_PLUGINS_BUILTIN "Build the plugin protocols directly into lws library" OFF)
+option(LWS_WITH_HTTP_PROXY "Support for active 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_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_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_ALSA "Enable alsa audio example" OFF)
+option(LWS_WITH_GTK "Enable gtk example" OFF)
+option(LWS_WITH_FTS "Full Text Search support" OFF)
+option(LWS_WITH_SYS_ASYNC_DNS "Nonblocking internal IPv4 + IPv6 DNS resolver" OFF)
+option(LWS_WITH_SYS_NTPCLIENT "Build in tiny ntpclient good for tls date validation and run via lws_system" OFF)
+option(LWS_WITH_SYS_DHCP_CLIENT "Build in tiny DHCP client" OFF)
+option(LWS_WITH_HTTP_BASIC_AUTH "Support Basic Auth" ON)
+option(LWS_WITH_HTTP_UNCOMMON_HEADERS "Include less common http header support" ON)
+option(LWS_WITH_SYS_STATE "lws_system state support" ON)
+option(LWS_WITH_SYS_SMD "Lws System Message Distribution" ON)
+option(LWS_WITH_SYS_FAULT_INJECTION "Enable fault injection support" OFF)
+option(LWS_WITH_SYS_METRICS "Lws Metrics API" OFF)
 
-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_MBED3 ON)
-# this implies no pthreads in the lib
-set(LWS_MAX_SMP 1)
+#
+# Secure Streams
+#
+option(LWS_WITH_SECURE_STREAMS "Secure Streams protocol-agnostic API" OFF)
+option(LWS_WITH_SECURE_STREAMS_CPP "Secure Streams C++ classes" OFF)
+option(LWS_WITH_SECURE_STREAMS_PROXY_API "Secure Streams support to work across processes" OFF)
+option(LWS_WITH_SECURE_STREAMS_SYS_AUTH_API_AMAZON_COM "Auth support for api.amazon.com" OFF)
+option(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY "Secure Streams Policy is hardcoded only" OFF)
+option(LWS_WITH_SECURE_STREAMS_AUTH_SIGV4 "Secure Streams Auth support for AWS Sigv4" OFF)
+option(LWS_WITH_SECURE_STREAMS_BUFFER_DUMP "Secure Streams protocol buffer dump" OFF)
+option(LWS_WITH_SS_DIRECT_PROTOCOL_STR "Secure Streams directly set/get metadata w/o policy" OFF)
 
-endif()
+#
+# CTest options
+#
+#
+# If you build with LWS_WITH_MINIMAL_EXAMPLES, you can use CTest / make test to run
+# examples that can give a pass/fail response.  By default it runs tests both against
+# a local server peer and warmcat.com, if your CI wants to do the tests but does not
+# have internet routing, then you can still run a subset of tests with CTest / make
+# test that only does local tests by disabling this option.
+#
+option(LWS_CTEST_INTERNET_AVAILABLE "CTest will performs tests that need the Internet" ON)
 
-if (WIN32)
-# this implies no pthreads in the lib
-set(LWS_MAX_SMP 1)
-endif()
+#
+# 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 may 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)
+option(LWS_TLS_LOG_PLAINTEXT_RX "For debugging log the received plaintext as soon as decrypted" OFF)
+option(LWS_TLS_LOG_PLAINTEXT_TX "For debugging log the transmitted plaintext just before encryption" OFF)
+option(LWS_WITH_TLS_SESSIONS "Enable persistent, resumable TLS sessions" ON)
+option(LWS_WITH_TLS_JIT_TRUST "Enable dynamically computing which trusted TLS CA is needed to be instantiated" OFF)
 
+#
+# 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)
+option(LWS_WITH_GLIB "Compile with support for glib event loop" OFF)
+option(LWS_WITH_SDEVENT "Compile with support for sd-event loop" OFF)
+option(LWS_WITH_ULOOP "Compile with support for uloop" OFF)
 
-if (LWS_WITHOUT_SERVER)
-set(LWS_WITH_LWSWS OFF)
+if (UNIX)
+# since v4.1, on unix platforms default is build any event libs as runtime plugins
+option(LWS_WITH_EVLIB_PLUGINS "Compile event lib support into runtime-selected plugins" ON)
+else()
+# otherwise default to linking the event lib(s) to libwebsockets.so
+option(LWS_WITH_EVLIB_PLUGINS "Compile event lib support into runtime-selected plugins" OFF)
 endif()
+#
+# LWS Drivers
+#
 
-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")
-endif()
+option(LWS_WITH_DRIVERS "With generic drivers for gpio, i2c, display etc" OFF)
 
-# Allow the user to override installation directories.
-set(LWS_INSTALL_LIB_DIR       lib CACHE PATH "Installation directory for libraries")
-set(LWS_INSTALL_BIN_DIR       bin CACHE PATH "Installation directory for executables")
-set(LWS_INSTALL_INCLUDE_DIR   include CACHE PATH "Installation directory for header files")
-set(LWS_INSTALL_EXAMPLES_DIR  bin CACHE PATH "Installation directory for example files")
+#
+# 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)
+option(LWS_SUPPRESS_DEPRECATED_API_WARNINGS "Turn off complaints about, eg, openssl 3 deprecated api usage" ON)
 
-# 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!")
-endif()
-if (LWS_USE_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_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()
+#
+# Specific platforms
+#
+option(LWS_WITH_ESP32 "Build for ESP32" OFF)
+option(LWS_PLAT_OPTEE "Build for OPTEE" OFF)
+option(LWS_PLAT_FREERTOS "Build for FreeRTOS" OFF)
+option(LWS_PLAT_ANDROID "Android flavour of unix platform" OFF)
 
-if (LWS_WITHOUT_CLIENT AND LWS_WITHOUT_SERVER)
-       message(FATAL_ERROR "Makes no sense to compile with neither client nor server.")
+#
+# 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_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_CBOR "With the Lightweight LECP CBOR Parser" OFF)
+option(LWS_WITH_CBOR_FLOAT "Build floating point types if building CBOR LECP" ON)
+option(LWS_WITH_SQLITE3 "Require SQLITE3 support" OFF)
+option(LWS_WITH_STRUCT_JSON "Generic struct serialization to and from JSON" OFF)
+option(LWS_WITH_STRUCT_SQLITE3 "Generic struct serialization to and from SQLITE3" OFF)
+# broken atm
+#option(LWS_WITH_SMTP "Provide SMTP support" OFF)
+if (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 other than _err and _user from being compiled in" OFF)
+set(LWS_LOGGING_BITFIELD_SET 0 CACHE STRING "Bitfield describing which log levels to force included into the build")
+set(LWS_LOGGING_BITFIELD_CLEAR 0 CACHE STRING "Bitfield describing which log levels to force removed from the build")
+option(LWS_LOGS_TIMESTAMP "Timestamp at start of logs" ON)
+option(LWS_LOG_TAG_LIFECYCLE "Log tagged object lifecycle as NOTICE" ON)
+option(LWS_AVOID_SIGPIPE_IGN "Android 7+ reportedly needs this" OFF)
+option(LWS_WITH_JOSE "JOSE JSON Web Signature / Encryption / Keys (RFC7515/6/) API" OFF)
+option(LWS_WITH_COSE "COSE CBOR Signature / Encryption / Keys (RFC8152) 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 (unrelated to lws_cache_ttl)" OFF)
+option(LWS_WITH_ASAN "Build with gcc runtime sanitizer options enabled (needs libasan)" 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_SEQUENCER "lws_seq_t support" OFF)
+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)
+option(LWS_CLIENT_HTTP_PROXYING "Support external http proxies for client connections" ON)
+option(LWS_WITH_FILE_OPS "Support file operations vfs" ON)
+option(LWS_WITH_UDP "Platform supports UDP" ON)
+option(LWS_WITH_SPAWN "Spawn subprocesses with piped stdin/out/stderr" OFF)
+option(LWS_WITH_FSMOUNT "Overlayfs and fallback mounting apis" OFF)
+option(LWS_WITH_FANALYZER "Enable gcc -fanalyzer if compiler supports" OFF)
+option(LWS_HTTP_HEADERS_ALL "Override header reduction optimization and include all like older lws versions" OFF)
+option(LWS_WITH_SUL_DEBUGGING "Enable zombie lws_sul checking on object deletion" OFF)
+option(LWS_WITH_PLUGINS_API "Build generic lws_plugins apis (see LWS_WITH_PLUGINS to also build protocol plugins)" OFF)
+option(LWS_WITH_CONMON "Collect introspectable connection latency stats on individual client connections" ON)
+option(LWS_WITHOUT_EVENTFD "Force using pipe instead of eventfd" OFF)
+if (UNIX OR WIN32)
+       option(LWS_WITH_CACHE_NSCOOKIEJAR "Build file-backed lws-cache-ttl that uses netscape cookie jar format (linux-only)" ON)
+else()
+       option(LWS_WITH_CACHE_NSCOOKIEJAR "Build file-backed lws-cache-ttl that uses netscape cookie jar format (linux-only)" OFF)
 endif()
 
-if (NOT (LWS_WITH_STATIC OR LWS_WITH_SHARED))
-       message(FATAL_ERROR "Makes no sense to compile with neither static nor shared libraries.")
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+       option(LWS_WITH_NETLINK "Monitor Netlink for Routing Table changes" ON)
+else()
+       set(LWS_WITH_NETLINK 0)
 endif()
 
-if (NOT LWS_WITHOUT_EXTENSIONS)
-       if (NOT LWS_WITH_ZLIB)
-               message(FATAL_ERROR "zlib is required for extensions.")
-       endif()
+if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+       # its openssl has md5 deprecated
+       set(LWS_SUPPRESS_DEPRECATED_API_WARNINGS 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")
-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_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")
-set(LWS_SQLITE3_LIBRARIES CACHE PATH "Path to the libuv library")
-set(LWS_SQLITE3_INCLUDE_DIRS CACHE PATH "Path to the libuv include directory")
 
+#
+# to use miniz, enable both LWS_WITH_ZLIB and LWS_WITH_MINIZ
+#
+# End of user settings
+#
 
-if (NOT LWS_WITH_SSL)
-       set(LWS_WITHOUT_BUILTIN_SHA1 OFF)
-endif()
+# sets of sub-options implied by other options
+#
+set(LIB_LIST "")
+set(LIB_LIST_AT_END)
+set(LWS_LIBRARIES)
+set(LWS_OPENSSL_SUPPORT 0)
+include(CMakeLists-implied-options.txt)
 
-if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
-       if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
-       else()
-               set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
-               set(OPENSSL_INCLUDE_DIRS ${LWS_OPENSSL_INCLUDE_DIRS})
-               set(OPENSSL_FOUND 1)
-       endif()
-endif()
+#
+# Structural helpers for cmake in subdirs
+#
 
-if (LWS_WITH_SSL AND LWS_USE_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.")
-                       else()
-                               message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_USE_WOLFSSL is turned on.")
-                       endif()
-               endif()
-       else()
-               set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES})
-               set(WOLFSSL_INCLUDE_DIRS ${LWS_WOLFSSL_INCLUDE_DIRS})
-               set(WOLFSSL_FOUND 1)
+macro(add_subdir_include_directories arg1)
+       add_subdirectory(${arg1})
+       include_directories(${_CMAKE_INC_LIST})
+endmacro()
+
+macro(exports_to_parent_scope)
+       set(SOURCES ${SOURCES} PARENT_SCOPE)
+       if (LIB_LIST)
+               set(LIB_LIST ${LIB_LIST} PARENT_SCOPE)
        endif()
-       set(USE_WOLFSSL 1)
-       if (LWS_USE_CYASSL)
-               set(USE_OLD_CYASSL 1)
+       get_property(_CURR DIRECTORY PROPERTY INCLUDE_DIRECTORIES) 
+       set(_CMAKE_INC_LIST ${_CURR} PARENT_SCOPE)
+       if (LWS_LIB_BUILD_INC_PATHS)
+               set(LWS_LIB_BUILD_INC_PATHS ${LWS_LIB_BUILD_INC_PATHS} PARENT_SCOPE)
        endif()
-endif()
+endmacro()
 
-if (LWS_WITH_SSL AND LWS_USE_MBEDTLS)
-       if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "")
-               if (NOT MBEDTLS_FOUND)
-                       message(FATAL_ERROR "You must set LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS when LWS_USE_MBEDTLS is turned on.")
-               endif()
-       else()
-               set(MBEDTLS_LIBRARIES ${LWS_MBEDTLS_LIBRARIES})
-               set(MBEDTLS_INCLUDE_DIRS ${LWS_MBEDTLS_INCLUDE_DIRS})
-               set(MBEDTLS_FOUND 1)
+macro(export_to_parent_intermediate)
+       set(SOURCES ${SOURCES} PARENT_SCOPE)
+       if (LIB_LIST)
+               set(LIB_LIST ${LIB_LIST} PARENT_SCOPE)
        endif()
-       set(USE_MBEDTLS 1)
-endif()
-
-if (LWS_WITH_ZLIB AND NOT LWS_USE_BUNDLED_ZLIB)
-       if ("${LWS_ZLIB_LIBRARIES}" STREQUAL "" OR "${LWS_ZLIB_INCLUDE_DIRS}" STREQUAL "")
-       else()
-               set(ZLIB_LIBRARIES ${LWS_ZLIB_LIBRARIES})
-               set(ZLIB_INCLUDE_DIRS ${LWS_ZLIB_INCLUDE_DIRS})
-               set(ZLIB_FOUND 1)
+       set(_CMAKE_INC_LIST ${_CMAKE_INC_LIST} PARENT_SCOPE)
+       if (LWS_LIB_BUILD_INC_PATHS)
+               set(LWS_LIB_BUILD_INC_PATHS ${LWS_LIB_BUILD_INC_PATHS} PARENT_SCOPE)
        endif()
-endif()
+endmacro()
 
-if (LWS_WITH_LIBEV)
-       if ("${LWS_LIBEV_LIBRARIES}" STREQUAL "" OR "${LWS_LIBEV_INCLUDE_DIRS}" STREQUAL "")
-       else()
-               set(LIBEV_LIBRARIES ${LWS_LIBEV_LIBRARIES})
-               set(LIBEV_INCLUDE_DIRS ${LWS_LIBEV_INCLUDE_DIRS})
-               set(LIBEV_FOUND 1)
-       endif()
-endif()
+#
+# Try to find the current Git hash
+#
 
-if (LWS_WITH_LIBUV)
-       if ("${LWS_LIBUV_LIBRARIES}" STREQUAL "" OR "${LWS_LIBUV_INCLUDE_DIRS}" STREQUAL "")
-       else()
-               set(LIBUV_LIBRARIES ${LWS_LIBUV_LIBRARIES})
-               set(LIBUV_INCLUDE_DIRS ${LWS_LIBUV_INCLUDE_DIRS})
-               set(LIBUV_FOUND 1)
+find_package(Git)
+if(GIT_EXECUTABLE)
+       execute_process(
+               WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+               COMMAND "${GIT_EXECUTABLE}" describe --tags --always
+               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()
 
-if (LWS_WITH_SQLITE3)
-       if ("${LWS_SQLITE3_LIBRARIES}" STREQUAL "" OR "${LWS_SQLITE3_INCLUDE_DIRS}" STREQUAL "")
-       else()
-               set(SQLITE3_LIBRARIES ${LWS_SQLITE3_LIBRARIES})
-               set(SQLITE3_INCLUDE_DIRS ${LWS_SQLITE3_INCLUDE_DIRS})
-               set(SQLITE3_FOUND 1)
-       endif()
+if ("${LWS_BUILD_HASH}" STREQUAL "")
+       set(LWS_BUILD_HASH "unknown")
 endif()
 
+set(PACKAGE "libwebsockets")
+set(CPACK_RPM_PACKAGE_LICENSE "MIT")
+set(CPACK_PACKAGE_NAME "${PACKAGE}")
+set(CPACK_PACKAGE_VERSION_MAJOR "4")
+set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_PATCH_NUMBER "2")
 
-# FIXME: This must be runtime-only option.
-# 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)
-       set(LWS_OPENSSL_CLIENT_CERTS . CACHE PATH "Client SSL certificate directory")
+set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH_NUMBER}-${LWS_BUILD_HASH}")
+set(CPACK_PACKAGE_RELEASE 1)
 
-       if (LWS_IPV6)
-               set(LWS_IPV6 OFF)
-               message(WARNING "IPv6 does not currently work on Windows!")
-       endif()
-        if (LWS_UNIX_SOCK)
-               set(LWS_UNIX_SOCK OFF)
-                message(WARNING "Windows does not support UNIX domain sockets")
-       endif()
-else()
-       set(LWS_OPENSSL_CLIENT_CERTS /etc/pki/tls/certs/ CACHE PATH "Client SSL certificate directory")
+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} ${CPACK_PACKAGE_VERSION}")
+set(SOVERSION "19")
+if(NOT CPACK_GENERATOR)
+    if(UNIX)
+        set(CPACK_GENERATOR "TGZ")
+    else()
+        set(CPACK_GENERATOR "ZIP")
+    endif()
 endif()
+set(CPACK_SOURCE_GENERATOR "TGZ")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+set(VERSION "${CPACK_PACKAGE_VERSION}")
 
-if (LWS_WITHOUT_EXTENSIONS)
-       set(LWS_NO_EXTENSIONS 1)
-endif()
+set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
+set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+# below makes path length problems in CI
+set(CPACK_RPM_DEBUGINFO_PACKAGE OFF)
+# below makes some kind of chimera rpm with binaries and sources
+set(CPACK_RPM_PACKAGE_SOURCES OFF)
+set(CPACK_RPM_INSTALL_WITH_EXEC ON)
+set(CPACK_RPM_COMPONENT_INSTALL ON)
 
-if (LWS_WITH_SSL)
-       set(LWS_OPENSSL_SUPPORT 1)
-endif()
+set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_DEBUGINFO_PACKAGE ON)
+set(CPACK_DEBIAN_PACKAGE_SOURCE ON)
+set(CPACK_DEBIAN_COMPONENT_INSTALL ON)
 
-if (LWS_SSL_CLIENT_USE_OS_CA_CERTS)
-       set(LWS_SSL_CLIENT_USE_OS_CA_CERTS 1)
-endif()
 
-if (LWS_WITH_LATENCY)
-       set(LWS_LATENCY 1)
-endif()
+set(LWS_LIBRARY_VERSION ${CPACK_PACKAGE_VERSION})
+set(LWS_LIBRARY_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
+set(LWS_LIBRARY_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
+set(LWS_LIBRARY_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH_NUMBER})
+set(LWS_LIBRARY_VERSION_PATCH_ELABORATED ${CPACK_PACKAGE_VERSION_PATCH})
 
-if (LWS_WITHOUT_DAEMONIZE OR WIN32)
-       set(LWS_NO_DAEMONIZE 1)
+if (NOT CMAKE_MODULE_PATH)
+       set(CMAKE_MODULE_PATH "")
 endif()
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 
-if (LWS_WITHOUT_SERVER)
-       set(LWS_NO_SERVER 1)
-endif()
 
-if (LWS_WITHOUT_CLIENT)
-       set(LWS_NO_CLIENT 1)
+if (CMAKE_TOOLCHAIN_FILE)
+       message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'")
 endif()
 
-if (LWS_WITH_LIBEV)
-       set(LWS_USE_LIBEV 1)
+if (NOT LIB_SUFFIX)
+       set(LIB_SUFFIX "")
 endif()
 
-if (LWS_WITH_LIBUV)
-       set(LWS_USE_LIBUV 1)
+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()
 
-if (LWS_IPV6)
-       set(LWS_USE_IPV6 1)
-endif()
+include_directories(include)
 
-if (LWS_UNIX_SOCK)
-    set(LWS_USE_UNIX_SOCK 1)
-endif()
+# Allow the user to override installation directories.
+set(LWS_INSTALL_LIB_DIR       lib CACHE PATH "Installation directory for libraries")
+set(LWS_INSTALL_BIN_DIR       bin CACHE PATH "Installation directory for executables")
+set(LWS_INSTALL_INCLUDE_DIR   include CACHE PATH "Installation directory for header files")
+set(LWS_INSTALL_EXAMPLES_DIR  bin CACHE PATH "Installation directory for example files")
 
-if (LWS_WITH_HTTP2)
-       set(LWS_USE_HTTP2 1)
-endif()
+# if you gave LWS_WITH_MINIZ, point to MINIZ here if not found
+# automatically
 
-if ("${LWS_MAX_SMP}" STREQUAL "")
-       set(LWS_MAX_SMP 32)
-endif()
+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_SQLITE3_LIBRARIES CACHE PATH "Path to the sqlite3 library")
+set(LWS_SQLITE3_INCLUDE_DIRS CACHE PATH "Path to the sqlite3 include directory")
+set(LWS_LIBMOUNT_INCLUDE_DIRS CACHE PATH "Path to the libmount include directory")
+set(LWS_LIBMOUNT_LIBRARIES CACHE PATH "Path to the libmount library")
+# on unix, these are in the toolchain.  On win32 you have to put them somewhere
+# yourself and point to them here
+set(LWS_EXT_PTHREAD_INCLUDE_DIR CACHE PATH "Path to an external pthreads include directory")
+set(LWS_EXT_PTHREAD_LIBRARIES CACHE PATH "Path to an external pthreads library")
 
 
-#if (LWS_MBED3)
-#      set(CMAKE_C_FLAGS "-D_DEBUG ${CMAKE_C_FLAGS}")
-#endif()
+if (LWS_WITH_HTTP_STREAM_COMPRESSION)
+       set(LWS_WITH_ZLIB 1)
+endif()
 
-if (MINGW)
-       set(LWS_MINGW_SUPPORT 1)
-       set(CMAKE_C_FLAGS "-D__USE_MINGW_ANSI_STDIO ${CMAKE_C_FLAGS}")
+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})
+               set(ZLIB_INCLUDE_DIRS ${LWS_ZLIB_INCLUDE_DIRS})
+               set(ZLIB_FOUND 1)
+       endif()
 endif()
 
-if (LWS_SSL_SERVER_WITH_ECDH_CERT)
-       set(LWS_SSL_SERVER_WITH_ECDH_CERT 1)
+
+if (LWS_WITH_SQLITE3)
+       if ("${LWS_SQLITE3_LIBRARIES}" STREQUAL "" OR "${LWS_SQLITE3_INCLUDE_DIRS}" STREQUAL "")
+       else()
+               set(SQLITE3_LIBRARIES ${LWS_SQLITE3_LIBRARIES})
+               set(SQLITE3_INCLUDE_DIRS ${LWS_SQLITE3_INCLUDE_DIRS})
+               set(SQLITE3_FOUND 1)
+       endif()
 endif()
 
 include_directories("${PROJECT_BINARY_DIR}")
 
-include(CheckCSourceCompiles)
-
 # Check for different inline keyword versions.
 foreach(KEYWORD "inline" "__inline__" "__inline")
        set(CMAKE_REQUIRED_DEFINITIONS "-DKEYWORD=${KEYWORD}")
@@ -395,28 +539,31 @@ if (NOT LWS_HAVE_inline)
        endif()
 endif()
 
-# Put the libaries and binaries that get built into directories at the
+# Put the libraries and binaries that get built into directories at the
 # top of the build tree rather than in hard-to-find leaf directories. 
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
 
+SET(LWS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}")
+
 # Put absolute path of dynamic libraries into the object code. Some
 # architectures, notably Mac OS X, need this.
 SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}")
 
-include(CheckFunctionExists)
-include(CheckSymbolExists)
-include(CheckIncludeFile)
-include(CheckIncludeFiles)
-include(CheckLibraryExists)
-include(CheckTypeSize)
-
 if (LWS_WITHOUT_BUILTIN_SHA1)
        set(LWS_SHA1_USE_OPENSSL_NAME 1)
 endif()
 
-CHECK_FUNCTION_EXISTS(bzero LWS_HAVE_BZERO)
+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)
@@ -431,6 +578,25 @@ CHECK_FUNCTION_EXISTS(snprintf LWS_HAVE_SNPRINTF)
 CHECK_FUNCTION_EXISTS(_snprintf LWS_HAVE__SNPRINTF)
 CHECK_FUNCTION_EXISTS(_vsnprintf LWS_HAVE__VSNPRINTF)
 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)
+CHECK_FUNCTION_EXISTS(localtime_r LWS_HAVE_LOCALTIME_R)
+CHECK_FUNCTION_EXISTS(gmtime_r LWS_HAVE_GMTIME_R)
+CHECK_FUNCTION_EXISTS(ctime_r LWS_HAVE_CTIME_R)
+CHECK_FUNCTION_EXISTS(getgrgid_r LWS_HAVE_GETGRGID_R)
+CHECK_FUNCTION_EXISTS(getgrnam_r LWS_HAVE_GETGRNAM_R)
+CHECK_FUNCTION_EXISTS(getpwuid_r LWS_HAVE_GETPWUID_R)
+CHECK_FUNCTION_EXISTS(getpwnam_r LWS_HAVE_GETPWNAM_R)
+CHECK_FUNCTION_EXISTS(timegm LWS_HAVE_TIMEGM)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+       if(CMAKE_OSX_DEPLOYMENT_TARGET LESS "10.12")
+               message("No clock_gettime found on macOS ${CMAKE_OSX_DEPLOYMENT_TARGET}. Disabling LWS_HAVE_CLOCK_GETTIME.")
+               set(LWS_HAVE_CLOCK_GETTIME 0)
+       endif()
+endif()
 
 if (NOT LWS_HAVE_GETIFADDRS)
        if (LWS_WITHOUT_BUILTIN_GETIFADDRS)
@@ -439,37 +605,131 @@ if (NOT LWS_HAVE_GETIFADDRS)
        set(LWS_BUILTIN_GETIFADDRS 1)
 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)
-CHECK_INCLUDE_FILE(stdlib.h LWS_HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE(strings.h LWS_HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE(string.h LWS_HAVE_STRING_H)
-CHECK_INCLUDE_FILE(sys/prctl.h LWS_HAVE_SYS_PRCTL_H)
-CHECK_INCLUDE_FILE(sys/socket.h LWS_HAVE_SYS_SOCKET_H)
-CHECK_INCLUDE_FILE(sys/stat.h LWS_HAVE_SYS_STAT_H)
-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)
+if (LWS_EXT_PTHREAD_INCLUDE_DIR)
+       set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${LWS_EXT_PTHREAD_INCLUDE_DIR})
+       include_directories(${LWS_EXT_PTHREAD_INCLUDE_DIR})
+
+       list(APPEND LIB_LIST_AT_END ${LWS_EXT_PTHREAD_LIBRARIES})
+       set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} " -DHAVE_STRUCT_TIMESPEC=1")
+endif()
+
+#
+# add libs here that need to be at the end of the link order
+#
+
+if (LWS_EXT_PTHREAD_INCLUDE_DIR)
+       list(APPEND LIB_LIST_AT_END ${LWS_EXT_PTHREAD_LIBRARIES})
+endif()
+
+if (LWS_WITH_ZLIB AND NOT LWS_WITH_BUNDLED_ZLIB)
+       list(APPEND LIB_LIST_AT_END "${ZLIB_LIBRARIES}")
+endif()
+
+if (LWS_WITH_PLUGINS_API AND UNIX AND CMAKE_DL_LIBS AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX"))
+       list(APPEND LIB_LIST_AT_END ${CMAKE_DL_LIBS})
+endif()
+
+
+CHECK_INCLUDE_FILE(in6addr.h LWS_HAVE_IN6ADDR_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)
+CHECK_INCLUDE_FILE(stdlib.h LWS_HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE(strings.h LWS_HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE(string.h LWS_HAVE_STRING_H)
+CHECK_INCLUDE_FILE(sys/prctl.h LWS_HAVE_SYS_PRCTL_H)
+CHECK_INCLUDE_FILE(sys/socket.h LWS_HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILE(sys/sockio.h LWS_HAVE_SYS_SOCKIO_H)
+CHECK_INCLUDE_FILE(sys/stat.h LWS_HAVE_SYS_STAT_H)
+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_INCLUDE_FILE(sys/resource.h LWS_HAVE_SYS_RESOURCE_H)
+
+if (WIN32 OR MSVC)
+       CHECK_C_SOURCE_COMPILES("#include <winsock2.h>
+                                #include <afunix.h>
+                                int main() { return 0; }" LWS_HAVE_WIN32_AFUNIX_H)
+
+       if (LWS_UNIX_SOCK AND NOT LWS_HAVE_WIN32_AFUNIX_H)
+               message("No afunix.h found. Disabling LWS_UNIX_SOCK.")
+               set(LWS_WITH_UNIX_SOCK OFF)
+       endif()
+endif()
+
+CHECK_LIBRARY_EXISTS(cap cap_set_flag "" LWS_HAVE_LIBCAP)
+
+
+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()
+
+CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h" STDC_HEADERS)
+
+if (NOT CMAKE_REQUIRED_FLAGS)
+       set(CMAKE_REQUIRED_FLAGS "")
+endif()
+if (NOT CMAKE_REQUIRED_INCLUDES)
+       set(CMAKE_REQUIRED_INCLUDES "")
+endif()
+if (NOT CMAKE_REQUIRED_LIBRARIES)
+       set(CMAKE_REQUIRED_LIBRARIES "")
+endif()
+
+CHECK_C_SOURCE_COMPILES("#include <stdint.h> 
+       int main(void) {
+               intptr_t test = 1;
+               return 0;
+       }" LWS_HAS_INTPTR_T)
 
-if (LWS_WITH_ZLIB AND NOT LWS_USE_BUNDLED_ZLIB)
-       CHECK_INCLUDE_FILE(zlib.h LWS_HAVE_ZLIB_H)
+if ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR
+    (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+       set(COMPILER_IS_CLANG ON)
 endif()
 
-# TODO: These can also be tested to see whether they actually work...
-set(LWS_HAVE_WORKING_FORK LWS_HAVE_FORK)
-set(LWS_HAVE_WORKING_VFORK LWS_HAVE_VFORK)
+if (LWS_HAVE_PTHREAD_H AND NOT LWS_PLAT_FREERTOS)
+       CHECK_C_SOURCE_COMPILES("
+               #ifndef _GNU_SOURCE
+               #define _GNU_SOURCE
+               #endif
+               #include <pthread.h>
+               int main(void) {
+               #ifdef __PTW32_H
+                       pthread_t th = {0,0};
+               #else
+                       pthread_t th = 0;
+               #endif
+                       pthread_setname_np(th, NULL);
+                       return 0;
+               }" LWS_HAS_PTHREAD_SETNAME_NP)
+endif()
+
+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)
 
-CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
+CHECK_C_SOURCE_COMPILES("#include <linux/rtnetlink.h>
+       int main(void) {
+               int test = RTA_PREF;
+               return 0;
+       }" LWS_HAVE_RTA_PREF)
 
-# 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)
+CHECK_C_SOURCE_COMPILES("#include <sys/types.h>
+       int main(void) {
+               suseconds_t x = 0;
+               return (int)x;
+       }" LWS_HAVE_SUSECONDS_T)
 
 if (NOT PID_T_SIZE)
        set(pid_t int)
@@ -488,378 +748,174 @@ if (NOT LWS_HAVE_REALLOC)
 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/private-libwebsockets.h)
-
-set(HDR_PUBLIC
-       "${PROJECT_SOURCE_DIR}/lib/libwebsockets.h"
-       "${PROJECT_BINARY_DIR}/lws_config.h")
-
-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 (NOT LWS_WITHOUT_CLIENT)
-       list(APPEND SOURCES
-               lib/client.c
-               lib/client-handshake.c
-               lib/client-parser.c)
-endif()
-
-if (LWS_WITH_SSL)
-       list(APPEND SOURCES
-               lib/ssl.c)
-               
-       if (NOT LWS_WITHOUT_SERVER)
-               list(APPEND SOURCES
-               lib/ssl-server.c)
-       endif()
-       if (NOT LWS_WITHOUT_CLIENT)
-               list(APPEND SOURCES
-               lib/ssl-client.c)
-       endif()
-endif()
 
-if (NOT LWS_WITHOUT_BUILTIN_SHA1)
-       list(APPEND SOURCES
-               lib/sha-1.c)
-endif()
 
-if (LWS_WITH_HTTP2)
-       list(APPEND SOURCES
-               lib/http2.c
-               lib/hpack.c
-               lib/ssl-http2.c)
-endif()
-# select the active platform files
+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_WITH_FANALYZER)
+           CHECK_C_COMPILER_FLAG(-fanalyzer LWS_HAVE_FANALYZER)
+    endif()
+    if (LWS_HAVE_VISIBILITY)
+                set(VISIBILITY_FLAG -fvisibility=hidden)
+    endif()
+    if (LWS_WITH_GCOV)
+           set (GCOV_FLAGS "-fprofile-arcs -ftest-coverage ")
+    else()
+           set(GCOV_FLAGS "")
+    endif()
 
-if (WIN32)
-       list(APPEND SOURCES
-               lib/lws-plat-win.c)
-else()
-       if (LWS_MBED3)
-               list(APPEND SOURCES
-                       lib/lws-plat-mbed3.cpp
-                       lib/lws-plat-mbed3.c)
+       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")
        else()
-               list(APPEND SOURCES
-                       lib/lws-plat-unix.c)
+               set(ASAN_FLAGS "")
        endif()
-endif()
-
-if (NOT LWS_WITHOUT_SERVER)
-       list(APPEND SOURCES
-               lib/server.c
-               lib/server-handshake.c)
-endif()
-
-if (NOT LWS_WITHOUT_EXTENSIONS)
-       list(APPEND HDR_PRIVATE
-               lib/extension-permessage-deflate.h)
-       list(APPEND SOURCES
-               lib/extension.c
-               lib/extension-permessage-deflate.c)
-endif()
-
-if (LWS_WITH_HTTP_PROXY)
-       list(APPEND SOURCES
-               lib/rewrite.c)
-endif()
 
-if (LWS_WITH_LIBEV)
-       list(APPEND SOURCES
-               lib/libev.c)
-endif()
+       check_c_compiler_flag("-Wignored-qualifiers" LWS_GCC_HAS_IGNORED_QUALIFIERS)
+       check_c_compiler_flag("-Wtype-limits" LWS_GCC_HAS_TYPE_LIMITS)
+       check_c_compiler_flag("-Wno-deprecated-declarations" LWS_GCC_HAS_NO_DEPRECATED_DECLARATIONS)
 
-if (LWS_WITH_LIBUV)
-       list(APPEND SOURCES
-               lib/libuv.c)
-endif()
+       if (LWS_GCC_HAS_IGNORED_QUALIFIERS)
+               set(CMAKE_C_FLAGS "-Wignored-qualifiers ${CMAKE_C_FLAGS}" )
+       endif()
 
-if (LWS_WITH_LEJP)
-       list(APPEND SOURCES
-               lib/lejp.c)
-       list(APPEND HDR_PUBLIC
-               lib/lejp.h)
-endif()        
-if (LWS_WITH_LEJP_CONF)
-               list(APPEND SOURCES
-                       "lib/lejp-conf.c"
-               )
-endif()
+       if (LWS_GCC_HAS_TYPE_LIMITS)
+               set(CMAKE_C_FLAGS "-Wtype-limits ${CMAKE_C_FLAGS}" )
+       endif()
 
-if (LWS_WITH_SMTP)
-       list(APPEND SOURCES
-               lib/smtp.c)
-endif()
+       if (LWS_WITH_FANALYZER AND LWS_HAVE_FANALYZER)
+               set(CMAKE_C_FLAGS "-fanalyzer ${CMAKE_C_FLAGS}" )
+       endif()
 
-# Add helper files for Windows.
-if (WIN32)
-       set(WIN32_HELPERS_PATH win32port/win32helpers)
-       include_directories(${WIN32_HELPERS_PATH})
+       if (CMAKE_COMPILER_IS_CLANG OR CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.4)
+               set(CMAKE_C_FLAGS "-Wuninitialized ${CMAKE_C_FLAGS}")
+       endif()
 
-               if (WIN32)
-                       list(APPEND SOURCES
-                               ${WIN32_HELPERS_PATH}/gettimeofday.c
-                       )
+       # always warn all and generate debug info
+       if (UNIX AND NOT LWS_PLAT_FREERTOS)
+               set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wconversion -Wsign-compare -Wstrict-aliasing ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" )
+       else()
+               set(CMAKE_C_FLAGS "-Wall -Wsign-compare ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" )
+       endif()
 
-                       list(APPEND HDR_PRIVATE
-                               ${WIN32_HELPERS_PATH}/gettimeofday.h
-                       )
-               endif(WIN32)
+       if (PICO_SDK_PATH)
+               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wconversion -Wsign-compare -Wstrict-aliasing -Wundef -nolibc")
+       endif()
 
-else()
-       # Unix.
-       if (NOT LWS_WITHOUT_DAEMONIZE)
-               list(APPEND SOURCES
-                       lib/daemonize.c)
+       if (ESP_PLATFORM AND (CONFIG_IDF_TARGET_ESP32 OR CONFIG_IDF_TARGET_ESP32S2 OR CONFIG_IDF_TARGET_ESP32S3))
+               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlongcalls")
        endif()
-endif()
 
-if (UNIX)
-       if (NOT LWS_HAVE_GETIFADDRS)
-               list(APPEND HDR_PRIVATE lib/getifaddrs.h)
-               list(APPEND SOURCES lib/getifaddrs.c)
+       if ("${DISABLE_WERROR}" STREQUAL "OFF")
+               set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
        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"))
-    include (CheckCCompilerFlag)
-    CHECK_C_COMPILER_FLAG(-fvisibility=hidden LWS_HAVE_VISIBILITY)
-    if (LWS_HAVE_VISIBILITY)
-                set(VISIBILITY_FLAG -fvisibility=hidden)
-    endif()
-    if (UNIX)
-               set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
-    else(UNIX)
-               set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
-    endif(UNIX)
+       if (LWS_SUPPRESS_DEPRECATED_API_WARNINGS)
+               set(CMAKE_C_FLAGS "-Wno-deprecated ${CMAKE_C_FLAGS}")
+               if (LWS_GCC_HAS_NO_DEPRECATED_DECLARATIONS)
+                       set(CMAKE_C_FLAGS "-Wno-deprecated-declarations ${CMAKE_C_FLAGS}")
+               endif()
+       endif()
 endif ()
 
 if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT LWS_WITHOUT_TESTAPPS)
-    if (UNIX)
+       if (UNIX AND LWS_HAVE_PTHREAD_H AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX"))
        # 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" )
+       list(APPEND LIB_LIST_AT_END -lpthread)
     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 -Wno-error=unused-command-line-argument" )
+       endif()
 endif()
 
-source_group("Headers Private"  FILES ${HDR_PRIVATE})
-source_group("Headers Public"   FILES ${HDR_PUBLIC})
-source_group("Sources"          FILES ${SOURCES})
-
-#
-# Create the lib.
-#
-set(LWS_LIBRARIES)
-
-if (LWS_WITH_STATIC)
-       add_library(websockets STATIC
-                               ${HDR_PRIVATE}
-                               ${HDR_PUBLIC}
-                               ${SOURCES})
-       list(APPEND LWS_LIBRARIES websockets)
-
-       if (WIN32)
-               # Windows uses the same .lib ending for static libraries and shared
-               # library linker files, so rename the static library.
-               set_target_properties(websockets
-                       PROPERTIES
-                       OUTPUT_NAME websockets_static)
-       endif()
+if (WINCE)
+       list(APPEND LIB_LIST_AT_END ws2.lib)
+elseif (WIN32)
+       list(APPEND LIB_LIST_AT_END ws2_32.lib userenv.lib psapi.lib iphlpapi.lib crypt32.lib)
 endif()
 
-if (LWS_WITH_SHARED)
-       add_library(websockets_shared SHARED
-                               ${HDR_PRIVATE}
-                               ${HDR_PUBLIC}
-                               ${SOURCES})
-       list(APPEND LWS_LIBRARIES websockets_shared)
-
-       # We want the shared lib to be named "libwebsockets"
-       # not "libwebsocket_shared".
-       set_target_properties(websockets_shared
-               PROPERTIES
-               OUTPUT_NAME websockets)
-
-       if (WIN32)
-               # Compile as DLL (export function declarations)
-               set_property(
-                       TARGET websockets_shared
-                       PROPERTY COMPILE_DEFINITIONS
-                       LWS_DLL
-                       LWS_INTERNAL)
+if (MSVC)
+       # Turn off pointless microsoft security warnings.
+       add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+       # Fail the build if any warnings
+       add_compile_options(/W3 /WX)
+       # Unbreak MSVC broken preprocessor __VA_ARGS__ behaviour
+       if (MSVC_VERSION GREATER 1925)
+               add_compile_options(/Zc:preprocessor /wd5105)
+       else()
+               add_compile_options(/experimental:preprocessor /wd5105)
        endif()
+endif(MSVC)
 
-       if (APPLE)
-               set_property(TARGET websockets_shared PROPERTY MACOSX_RPATH YES)
-       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()
 
-# 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"))
-       foreach(lib ${LWS_LIBRARIES})
-               set_target_properties(${lib}
-                       PROPERTIES
-                       SOVERSION ${SOVERSION})
-       endforeach()
+if (HDR_PRIVATE)
+       source_group("Headers Private"  FILES ${HDR_PRIVATE})
+endif()
+if (HDR_PUBLIC)
+       source_group("Headers Public"   FILES ${HDR_PUBLIC})
+endif()
+if (SOURCES)
+       source_group("Sources"          FILES ${SOURCES})
+endif()
+if (RESOURCES)
+       source_group("Resources"        FILES ${RESOURCES})
 endif()
 
-set(LIB_LIST)
-
-#
-# Find libraries.
-#
 
 #
-# 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 (WIN32)
-                       set(WIN32_ZLIB_PATH "win32port/zlib")
-                       set(ZLIB_SRCS
-                               ${WIN32_ZLIB_PATH}/adler32.c
-                               ${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
-                               ${WIN32_ZLIB_PATH}/infback.c
-                               ${WIN32_ZLIB_PATH}/inffast.c
-                               ${WIN32_ZLIB_PATH}/inflate.c
-                               ${WIN32_ZLIB_PATH}/inftrees.c
-                               ${WIN32_ZLIB_PATH}/trees.c
-                               ${WIN32_ZLIB_PATH}/uncompr.c
-                               ${WIN32_ZLIB_PATH}/zutil.c)
-                       add_library(zlib_internal STATIC ${ZLIB_SRCS})
-                       set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH})
-                       get_property(ZLIB_LIBRARIES TARGET zlib_internal PROPERTY LOCATION)
-                       set(ZLIB_FOUND 1)
-                       # Make sure zlib_internal is compiled before the libs.
-                       foreach (lib ${LWS_LIBRARIES})
-                               add_dependencies(${lib} zlib_internal)
-                       endforeach()
+       if (NOT ZLIB_FOUND)
+               if (LWS_WITH_MINIZ)
+                       find_package(Miniz REQUIRED)
+                       set(ZLIB_INCLUDE_DIRS ${MINIZ_INCLUDE_DIR})
+                       set(ZLIB_LIBRARIES ${MINIZ_LIBRARIES})
                else()
-                       message(FATAL_ERROR "Don't have bundled zlib for that platform")
+                       find_package(ZLIB REQUIRED)
                endif()
-       elseif (NOT ZLIB_FOUND)
-               find_package(ZLIB REQUIRED)
        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})
+       # done later at end of link list
+       # list(APPEND LIB_LIST ${ZLIB_LIBRARIES})
+       set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${ZLIB_LIBRARIES})
+       list(APPEND LIB_LIST_AT_END ${ZLIB_LIBRARIES})
 endif()
 
-#
-# OpenSSL
-#
-if (LWS_WITH_SSL)
-       message("Compiling with SSL support")
-       set(chose_ssl 0)
-       if (LWS_USE_WOLFSSL)
-               # Use wolfSSL as OpenSSL replacement.
-               # TODO: Add a find_package command for this also.
-               message("wolfSSL include dir: ${WOLFSSL_INCLUDE_DIRS}")
-               message("wolfSSL libraries: ${WOLFSSL_LIBRARIES}")
-
-               # Additional to the root directory we need to include
-               # the wolfssl/ subdirectory which contains the OpenSSL
-               # compatibility layer headers.
-
-               if (LWS_USE_CYASSL)
-                       foreach(inc ${WOLFSSL_INCLUDE_DIRS})
-                               include_directories("${inc}" "${inc}/cyassl")
-                       endforeach()
-               else()
-                       foreach(inc ${WOLFSSL_INCLUDE_DIRS})
-                               include_directories("${inc}" "${inc}/wolfssl")
-                       endforeach()
-               endif()
-
-               list(APPEND LIB_LIST "${WOLFSSL_LIBRARIES}")
-               set(chose_ssl 1)
-       endif()
-
-       if (NOT chose_ssl)
-               if (NOT OPENSSL_FOUND)
-                       # TODO: Add support for STATIC also.
-                       find_package(OpenSSL REQUIRED)
-                       set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
-               endif()
-
-               message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIRS}")
-               message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
-
-               include_directories("${OPENSSL_INCLUDE_DIRS}")
-               list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
-
-       # 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()
-       endif()
-
-endif(LWS_WITH_SSL)
 
-if (LWS_WITH_LIBEV)
-       if (NOT LIBEV_FOUND)
-               find_path(LIBEV_INCLUDE_DIRS NAMES ev.h)
-               find_library(LIBEV_LIBRARIES NAMES ev)
-               if(LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
-                       set(LIBEV_FOUND 1)
-               endif()
+if (LWS_WITH_FSMOUNT AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+       if (NOT LWS_LIBMOUNT_INCLUDE_DIRS STREQUAL "")
+               include_directories(${LWS_LIBMOUNT_INCLUDE_DIRS})
+               message("libmount include dir: ${LWS_LIBMOUNT_INCLUDE_DIRS}")
        endif()
-       message("libev include dir: ${LIBEV_INCLUDE_DIRS}")
-       message("libev libraries: ${LIBEV_LIBRARIES}")
-       include_directories("${LIBEV_INCLUDE_DIRS}")
-       list(APPEND LIB_LIST ${LIBEV_LIBRARIES})
-endif(LWS_WITH_LIBEV)
-
-if (LWS_WITH_LIBUV)
-       if (NOT LIBUV_FOUND)
-               find_path(LIBUV_INCLUDE_DIRS NAMES uv.h)
-               find_library(LIBUV_LIBRARIES NAMES uv)
-               if(LIBUV_INCLUDE_DIRS AND LIBUV_LIBRARIES)
-                       set(LIBUV_FOUND 1)
-               endif()
+       if (NOT LWS_LIBMOUNT_LIBRARIES STREQUAL "")
+               message("libmount libraries: ${LWS_LIBMOUNT_LIBRARIES}")
+               list(APPEND LIB_LIST ${LWS_LIBMOUNT_LIBRARIES})
+       else()
+               list(APPEND LIB_LIST mount)
        endif()
-       message("libuv include dir: ${LIBUV_INCLUDE_DIRS}")
-       message("libuv libraries: ${LIBUV_LIBRARIES}")
-       include_directories("${LIBUV_INCLUDE_DIRS}")
-       list(APPEND LIB_LIST ${LIBUV_LIBRARIES})
 endif()
 
+
 if (LWS_WITH_SQLITE3)
        if (NOT SQLITE3_FOUND)
                find_path(SQLITE3_INCLUDE_DIRS NAMES sqlite3.h)
@@ -875,533 +931,137 @@ if (LWS_WITH_SQLITE3)
 endif()
 
 
-if (LWS_WITH_HTTP_PROXY)
-       find_library(LIBHUBBUB_LIBRARIES NAMES libhubbub)
+if (LWS_WITH_HUBBUB)
+       find_library(LIBHUBBUB_LIBRARIES NAMES hubbub)
        list(APPEND LIB_LIST ${LIBHUBBUB_LIBRARIES} )
 endif()
 
-
-#
-# Platform specific libs.
-#
-if (WINCE)
-       list(APPEND LIB_LIST ws2.lib)
-elseif (WIN32)
-       list(APPEND LIB_LIST ws2_32.lib)
+if (LWS_HAVE_LIBCAP)
+       find_library(LIBCAP_LIBRARIES NAMES cap)
+       list(APPEND LIB_LIST ${LIBCAP_LIBRARIES} )
 endif()
 
-if (UNIX)
-       list(APPEND LIB_LIST m)
+if (LWS_WITH_PLUGINS_BUILTIN)
+       add_subdirectory(plugins)
 endif()
 
-# Setup the linking for all libs.
-foreach (lib ${LWS_LIBRARIES})
-       target_link_libraries(${lib} ${LIB_LIST})
-endforeach()
-
-set (temp ${CMAKE_REQUIRED_LIBRARIES})
-set(CMAKE_REQUIRED_LIBRARIES ${LIB_LIST})
-CHECK_FUNCTION_EXISTS(SSL_CTX_set1_param LWS_HAVE_SSL_CTX_set1_param)
-CHECK_FUNCTION_EXISTS(X509_VERIFY_PARAM_set1_host LWS_HAVE_X509_VERIFY_PARAM_set1_host)
-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_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_BINARY_DIR}/lws_config_private.h")
-
-
 
 #
-# Test applications
+# Append the "at end" pieces to the lib list
 #
-set(TEST_APP_LIST)
-if (NOT LWS_WITHOUT_TESTAPPS)
-       #
-       # Helper function for adding a test app.
-       #
-       macro(create_test_app TEST_NAME MAIN_SRC S2 S3 S4 S5 S6)
-
-               set(TEST_SRCS ${MAIN_SRC})
-               set(TEST_HDR)
-               if ("${S2}" STREQUAL "")
-               else()
-                       list(APPEND TEST_SRCS ${S2})
-               endif()
-               if ("${S3}" STREQUAL "")
-               else()
-                       list(APPEND TEST_SRCS ${S3})
-               endif()
-               if ("${S4}" STREQUAL "")
-               else()
-                       list(APPEND TEST_SRCS ${S4})
-               endif()
-               if ("${S5}" STREQUAL "")
-               else()
-                       list(APPEND TEST_SRCS ${S5})
-               endif()
-               if ("${S6}" STREQUAL "")
-               else()
-                       list(APPEND TEST_SRCS ${S6})
-               endif()
-               if (WIN32)
-                       list(APPEND TEST_SRCS
-                               ${WIN32_HELPERS_PATH}/getopt.c
-                               ${WIN32_HELPERS_PATH}/getopt_long.c
-                               ${WIN32_HELPERS_PATH}/gettimeofday.c
-                       )
-
-                       list(APPEND TEST_HDR
-                               ${WIN32_HELPERS_PATH}/getopt.h
-                               ${WIN32_HELPERS_PATH}/gettimeofday.h
-                       )
-               endif(WIN32)
-
-               source_group("Headers Private"   FILES ${TEST_HDR})
-               source_group("Sources"   FILES ${TEST_SRCS})
-               add_executable(${TEST_NAME} ${TEST_SRCS} ${TEST_HDR})
-
-               if (LWS_LINK_TESTAPPS_DYNAMIC)
-                       if (NOT LWS_WITH_SHARED)
-                               message(FATAL_ERROR "Build of the shared library is disabled. LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_SHARED.")
-                       endif()
-                       target_link_libraries(${TEST_NAME} websockets_shared)
-                       add_dependencies(${TEST_NAME} websockets_shared)
-               else()
-                       if (NOT LWS_WITH_STATIC)
-                               message(FATAL_ERROR "Build of the static library is disabled. Disabled LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_STATIC.")
-                       endif()
-                       target_link_libraries(${TEST_NAME} websockets)
-                       add_dependencies(${TEST_NAME} websockets)
-               endif()
-
-               # Set test app specific defines.
-               set_property(TARGET ${TEST_NAME}
-                                       PROPERTY COMPILE_DEFINITIONS
-                                               INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
-                                       )
-
-               # Prefix the binary names with libwebsockets.
-               set_target_properties(${TEST_NAME}
-                       PROPERTIES
-                       OUTPUT_NAME libwebsockets-${TEST_NAME})
-
-               # Add to the list of tests.
-               list(APPEND TEST_APP_LIST ${TEST_NAME})
-       endmacro()
-
-       if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
-               message("Searching for OpenSSL executable and dlls")
-               find_package(OpenSSLbins)
-               message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
-       endif()
-
-       if (UNIX AND LWS_WITH_PLUGINS)
-               set(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
-               target_link_libraries(websockets dl)
-       endif()
-
-       if (NOT LWS_WITHOUT_SERVER)
-               #
-               # 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"
-                               "test-server/test-server-mirror.c"
-                               "test-server/test-server-status.c"
-                               "test-server/test-server-echogen.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")))
-                               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"
-                                       "test-server/test-server-mirror.c"
-                                       "test-server/test-server-status.c"
-                                       "test-server/test-server-echogen.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"
-                                       "test-server/test-server-mirror.c"
-                                       "test-server/test-server-status.c"
-                                       "test-server/test-server-echogen.c")
-                       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"
-                                       "test-server/test-server-dumb-increment.c"
-                                       "test-server/test-server-mirror.c"
-                                       "test-server/test-server-status.c"
-                                       "test-server/test-server-echogen.c")
-                       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"
-                               "test-server/test-server-mirror.c"
-                               "test-server/test-server-status.c"
-                               "test-server/test-server-echogen.c")
-                       # Set defines for this executable only.
-                       set_property(
-                               TARGET test-server-extpoll
-                               PROPERTY COMPILE_DEFINITIONS 
-                                       EXTERNAL_POLL 
-                                       INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
-                               )
-
-                       # We need to link against winsock code.
-                       if (WIN32)
-                               target_link_libraries(test-server-extpoll ws2_32.lib)
-                       endif(WIN32)
-               endif()
-
-               #
-               # test-server-v2.0
-               #
-               if (LWS_WITH_PLUGINS)
-                       create_test_app(
-                               test-server-v2.0
-                               "test-server/test-server-v2.0.c"
-                               ""
-                               ""
-                               ""
-                               ""
-                               "")
-               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/libwebsockets.org-logo.png"
-                       "${PROJECT_SOURCE_DIR}/test-server/test.html")
-
-               # Generate self-signed SSL certs for the test-server.
-               if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER)
-                       message("Generating SSL Certificates for the test-server...")
-
-                       set(TEST_SERVER_SSL_KEY "${PROJECT_BINARY_DIR}/libwebsockets-test-server.key.pem")
-                       set(TEST_SERVER_SSL_CERT "${PROJECT_BINARY_DIR}/libwebsockets-test-server.pem")
-
-                       if (WIN32)
-                               if (MINGW)
-                                       message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -subj \"/C=GB/ST=Erewhon/L=All around/O=libwebsockets-test/CN=localhost\" -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
-                                       execute_process(
-                                               COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -subj "/C=GB/ST=Erewhon/L=All around/O=libwebsockets-test/CN=localhost" -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-                                               RESULT_VARIABLE OPENSSL_RETURN_CODE)
-                               else()
-                                       file(WRITE "${PROJECT_BINARY_DIR}/openssl_input.txt"
-                                               "GB\n"
-                                               "Erewhon\n"
-                                               "All around\n"
-                                               "libwebsockets-test\n"
-                                               "localhost\n"
-                                               "none@invalid.org\n\n"
-                                               )
-
-                                       # The "type" command is a bit picky with paths.
-                                       file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/openssl_input.txt" OPENSSL_INPUT_WIN_PATH)
-                                       message("OPENSSL_INPUT_WIN_PATH = ${OPENSSL_INPUT_WIN_PATH}")
-                                       message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
-
-                                       execute_process(
-                                               COMMAND cmd /c type "${OPENSSL_INPUT_WIN_PATH}"
-                                               COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-                                               RESULT_VARIABLE OPENSSL_RETURN_CODE
-                                               OUTPUT_QUIET ERROR_QUIET)
-
-                                       message("\n")
-                               endif()
-
-                               if (OPENSSL_RETURN_CODE)
-                                       message(WARNING "!!! Failed to generate SSL certificate for Test Server using cmd.exe !!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
-                               else()
-                                       message("SUCCSESFULLY generated SSL certificate")
-                               endif()
-                       else()
-                               # Unix.
-                               execute_process(
-                                       COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
-                                       COMMAND "${OPENSSL_EXECUTABLE}"
-                                               req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-                                       RESULT_VARIABLE OPENSSL_RETURN_CODE
-                                       OUTPUT_QUIET ERROR_QUIET)
-
-                               if (OPENSSL_RETURN_CODE)
-                                       message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
-                               else()
-                                       message("SUCCESSFULLY generated SSL certificate")
-                               endif()
-                       endif()
-
-                       list(APPEND TEST_SERVER_DATA 
-                               "${TEST_SERVER_SSL_KEY}"
-                               "${TEST_SERVER_SSL_CERT}")
-               endif()
-
-               add_custom_command(TARGET test-server
-                                               POST_BUILD 
-                                               COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server")
-
-               # Copy the file needed to run the server so that the test apps can
-               # reach them from their default output location
-               foreach (TEST_FILE ${TEST_SERVER_DATA})
-                       if (EXISTS ${TEST_FILE})
-                               add_custom_command(TARGET test-server
-                                                       POST_BUILD 
-                                                       COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
-                       endif()
-               endforeach()
-       endif(NOT LWS_WITHOUT_SERVER)
-
-       if (NOT LWS_WITHOUT_CLIENT)
-               #
-               # 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" "" "" "" "" "")
-               endif()
+list(APPEND LIB_LIST ${LIB_LIST_AT_END})
 
-       endif(NOT LWS_WITHOUT_CLIENT)
-       
-       
-       if (LWS_WITH_PLUGINS AND LWS_WITH_SHARED)
-               macro(create_plugin PLUGIN_NAME MAIN_SRC S2 S3)
-
-               set(PLUGIN_SRCS ${MAIN_SRC})
+#
+# Second-level CMakeLists
+#
 
-               if ("${S2}" STREQUAL "")
-               else()
-                       list(APPEND PLUGIN_SRCS ${S2})
-               endif()
-               if ("${S3}" STREQUAL "")
-               else()
-                       list(APPEND PLUGIN_SRCS ${S3})
-               endif()
+include_directories("${PROJECT_SOURCE_DIR}/lib")
 
-               if (WIN32)
-                       list(APPEND PLUGIN_SRCS
-                               ${WIN32_HELPERS_PATH}/getopt.c
-                               ${WIN32_HELPERS_PATH}/getopt_long.c
-                               ${WIN32_HELPERS_PATH}/gettimeofday.c
-                       )
+add_subdirectory(lib)
 
-                       list(APPEND PLUGIN_HDR
-                               ${WIN32_HELPERS_PATH}/getopt.h
-                               ${WIN32_HELPERS_PATH}/gettimeofday.h
-                       )
-               endif(WIN32)
 
-               source_group("Headers Private"   FILES ${PLUGIN_HDR})
-               source_group("Sources"   FILES ${PLUGIN_SRCS})
-               add_library(${PLUGIN_NAME} SHARED ${PLUGIN_SRCS} ${PLUGIN_HDR})
+if(WIN32 AND NOT CYGWIN)
+  set(DEF_INSTALL_CMAKE_DIR cmake)
+else()
+  set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets)
+endif()
+                
+configure_file(${PROJECT_SOURCE_DIR}/cmake/LwsCheckRequirements.cmake
+               ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LwsCheckRequirements.cmake
+               @ONLY)
                
-               target_link_libraries(${PLUGIN_NAME} websockets_shared)
-               add_dependencies(${PLUGIN_NAME} websockets_shared)
-
-               # Set test app specific defines.
-               set_property(TARGET ${PLUGIN_NAME}
-                            PROPERTY COMPILE_DEFINITIONS
-                            INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/plugins"
-               )
+configure_file(${PROJECT_SOURCE_DIR}/cmake/LwsCheckRequirements.cmake
+               ${PROJECT_BINARY_DIR}/LwsCheckRequirements.cmake
+               @ONLY)  
 
-#              set_target_properties(${PLUGIN_NAME}
-#                      PROPERTIES
-#                      OUTPUT_NAME ${PLUGIN_NAME})
+# Generate version info for both build-tree and install-tree.
+configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config-version.cmake.in
+                ${PROJECT_BINARY_DIR}/libwebsockets-config-version.cmake 
+                @ONLY)
 
-               list(APPEND PLUGINS_LIST ${PLUGIN_NAME})
+# Generate the config file for the build-tree.
+set(LWS__INCLUDE_DIRS 
+    "${PROJECT_SOURCE_DIR}/lib"
+    "${PROJECT_BINARY_DIR}")
+set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories")
+configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
+                ${PROJECT_BINARY_DIR}/libwebsockets-config.cmake 
+                @ONLY)
+set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
 
-               endmacro()
-               
+# Export targets (This is used for other CMake projects to easily find the libraries and include files).
+if (LWS_WITH_EXPORT_LWSTARGETS)
+    export(TARGETS ${LWS_LIBRARIES}
+            FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
+endif()
 
-               create_plugin(protocol_dumb_increment
-                             "plugins/protocol_dumb_increment.c" "" "")
-               create_plugin(protocol_lws_mirror
-                             "plugins/protocol_lws_mirror.c" "" "")
-               create_plugin(protocol_lws_status
-                             "plugins/protocol_lws_status.c" "" "")
-               create_plugin(protocol_post_demo
-                             "plugins/protocol_post_demo.c" "" "")
-if (LWS_WITH_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
-                              "plugins/protocol_client_loopback_test.c" "" "")
-endif(NOT LWS_WITHOUT_CLIENT)
-
-if (LWS_WITH_GENERIC_SESSIONS)
-       create_plugin(protocol_generic_sessions
-                      "plugins/generic-sessions/protocol_generic_sessions.c"
-                     "plugins/generic-sessions/utils.c"
-                     "plugins/generic-sessions/handlers.c")
-
-       if (WIN32)
-               target_link_libraries(protocol_generic_sessions ${LWS_SQLITE3_LIBRARIES})
-       else()
-               target_link_libraries(protocol_generic_sessions sqlite3 )
-       endif(WIN32)
 
-               create_plugin(protocol_lws_messageboard
-                             "plugins/generic-sessions/protocol_lws_messageboard.c" "" "")
-       if (WIN32)
-               target_link_libraries(protocol_lws_messageboard ${LWS_SQLITE3_LIBRARIES})
-       else()
-               target_link_libraries(protocol_lws_messageboard sqlite3 )
-       endif(WIN32)
-
-endif(LWS_WITH_GENERIC_SESSIONS)
-
-
-       endif(LWS_WITH_PLUGINS AND LWS_WITH_SHARED)
-
-       #
-       # 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(OPENSSL_BIN_FOUND)
-                       message("OpenSSL dlls found:")
-                       message("  Libeay: ${LIBEAY_BIN}")
-                       message("  SSLeay: ${SSLEAY_BIN}")
-
-                       foreach(TARGET_BIN ${TEST_APP_LIST})
-                               add_custom_command(TARGET ${TARGET_BIN}
-                                       POST_BUILD
-                                       COMMAND "${CMAKE_COMMAND}" -E copy "${LIBEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
-                               add_custom_command(TARGET ${TARGET_BIN}
-                                       POST_BUILD
-                                       COMMAND "${CMAKE_COMMAND}" -E copy "${SSLEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
-                       endforeach()
-               endif()
-       endif()
-endif(NOT LWS_WITHOUT_TESTAPPS)
 
-if (LWS_WITH_LWSWS)
-               list(APPEND LWSWS_SRCS
-                       "lwsws/main.c"
-               )
+set(libwebsockets_DIR ${PROJECT_BINARY_DIR})
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+message("DIR ${libwebsockets_DIR} CMP ${CMAKE_MODULE_PATH}")
 
-               if (WIN32)
-                       list(APPEND LWSWS_SRCS
-                               ${WIN32_HELPERS_PATH}/getopt.c
-                               ${WIN32_HELPERS_PATH}/getopt_long.c
-                               ${WIN32_HELPERS_PATH}/gettimeofday.c
-                       )
+if (LWS_WITH_MINIMAL_EXAMPLES)
+       add_subdirectory(minimal-examples)
+endif()
 
-                       list(APPEND LWSWS_HDR
-                               ${WIN32_HELPERS_PATH}/getopt.h
-                               ${WIN32_HELPERS_PATH}/gettimeofday.h
-                       )
-               endif(WIN32)
+if (NOT LWS_WITHOUT_TESTAPPS)
+       add_subdirectory(test-apps)
+endif()
 
-               source_group("Headers Private"   FILES ${LWSWS_HDR})
-               source_group("Sources"   FILES ${LWSWS_SRCS})
-               add_executable("lwsws" ${LWSWS_SRCS} ${LWSWS_HDR})
+if (NOT LWS_WITH_PLUGINS_BUILTIN)
+add_subdirectory(plugins)
+endif()
+add_subdirectory(lwsws)
 
-               target_link_libraries("lwsws" websockets_shared)
-               add_dependencies("lwsws" websockets_shared)
+# Generate the lws_config.h that includes all the public compilation settings.
+configure_file(
+       "${PROJECT_SOURCE_DIR}/cmake/lws_config.h.in"
+       "${PROJECT_BINARY_DIR}/lws_config.h")
+       
+add_custom_command(
+               OUTPUT ${PROJECT_BINARY_DIR}/include/lws_config.h
+                       ${PROJECT_BINARY_DIR}/include/libwebsockets
+                       ${PROJECT_BINARY_DIR}/include/libwebsockets.h
+               COMMENT "Creating build include dir"
+               COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets.h
+                       ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
+               COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets/
+                       ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets
+               COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/lws_config.h
+                       ${CMAKE_CURRENT_BINARY_DIR}/include/lws_config.h
+               MAIN_DEPENDENCY ${PROJECT_BINARY_DIR}/lws_config.h
+)
 
-               # Set test app specific defines.
-               set_property(TARGET "lwsws"
-                            PROPERTY COMPILE_DEFINITIONS
-                            INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
-               )
-endif (LWS_WITH_LWSWS)
+add_custom_target(GENHDR DEPENDS  ${PROJECT_BINARY_DIR}/include/lws_config.h)
 
-if (UNIX)
+file(GLOB HDR_PUBLIC1 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/libwebsockets/*.h)
+file(GLOB HDR_PUBLIC2 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/libwebsockets.h)
+file(GLOB HDR_PUBLIC3 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include/lws_config.h)
+list(APPEND HDR_PUBLIC ${HDR_PUBLIC1} ${HDR_PUBLIC2} ${HDR_PUBLIC3})
 
-# Generate and install pkgconfig.
-# (This is not indented, because the tabs will be part of the output)
-file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets.pc"
-"prefix=\"${CMAKE_INSTALL_PREFIX}\"
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib${LIB_SUFFIX}
-includedir=\${prefix}/include
+set_source_files_properties(${HDR_PUBLIC} PROPERTIES GENERATED 1)
 
-Name: libwebsockets
-Description: Websockets server and client library
-Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
+if (LWS_WITH_STATIC)
+       add_dependencies(websockets GENHDR)
+endif()
+if (LWS_WITH_SHARED)
+       add_dependencies(websockets_shared GENHDR)
+endif()
 
-Libs: -L\${libdir} -lwebsockets
-Cflags: -I\${includedir}"
-)
 
-       install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
-               DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-endif(UNIX)
 
 #
+#
 # Installation preparations.
 #
 
-if(WIN32 AND NOT CYGWIN)
-  set(DEF_INSTALL_CMAKE_DIR cmake)
-else()
-  set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets)
-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")
 export(PACKAGE libwebsockets)
 
-# Generate the config file for the build-tree.
-set(LWS__INCLUDE_DIRS 
-    "${PROJECT_SOURCE_DIR}/lib"
-    "${PROJECT_BINARY_DIR}")
-set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories")
-configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfig.cmake.in
-                ${PROJECT_BINARY_DIR}/LibwebsocketsConfig.cmake 
-                @ONLY)
+install(DIRECTORY include/libwebsockets
+       DESTINATION "${LWS_INSTALL_INCLUDE_DIR}" COMPONENT dev)
+install(FILES ${PROJECT_BINARY_DIR}/include/libwebsockets.h ${PROJECT_BINARY_DIR}/include/lws_config.h
+       DESTINATION "${LWS_INSTALL_INCLUDE_DIR}" COMPONENT dev)
 
 # Generate the config file for the installation tree.
 get_filename_component(LWS_ABSOLUTE_INSTALL_CMAKE_DIR ${LWS_INSTALL_CMAKE_DIR} ABSOLUTE)
@@ -1411,185 +1071,40 @@ file(RELATIVE_PATH
     "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
     "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
 
-# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in, 
-# we escape it here so it's evaluated when it is included instead
-# so that the include dirs are given relative to where the 
-# config file is located.
-set(LWS__INCLUDE_DIRS 
-    "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}") 
-configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfig.cmake.in
-                ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibwebsocketsConfig.cmake 
-                @ONLY)
-
-# Generate version info for both build-tree and install-tree.
-configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfigVersion.cmake.in
-                ${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake 
-                @ONLY)
-
-                       set_target_properties(${LWS_LIBRARIES}
-                                       PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")
-
-#
-# Installation.
-#
-
-# Install libs and headers.
-install(TARGETS ${LWS_LIBRARIES}
-               EXPORT LibwebsocketsTargets
-               LIBRARY DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT 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")
-
-# Install test apps.
-if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_CLIENT)
-       install(TARGETS test-client ${TEST_APP_LIST}
-                       RUNTIME DESTINATION ${LWS_INSTALL_EXAMPLES_DIR}
-                       COMPONENT examples)
-       set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example files")
-endif()
-
-# lwsws
-if (LWS_WITH_LWSWS)
-       install(TARGETS lwsws
-               RUNTIME DESTINATION "${LWS_INSTALL_BIN_DIR}" COMPONENT lwsws )
-endif()
-
-# Programs shared files used by the test-server.
-if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_SERVER)
-       install(FILES ${TEST_SERVER_DATA}
-                       DESTINATION share/libwebsockets-test-server
-                       COMPONENT examples)
-if (LWS_WITH_CGI)
-       set(CGI_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/test-server/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
-                       COMPONENT examples)
-       endif()
+if (DEFINED REL_INCLUDE_DIR)
+    set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
 endif()
-
-# plugins
-
-if (LWS_WITH_PLUGINS)
-       install(TARGETS ${PLUGINS_LIST}
-               PERMISSIONS  OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ
-               DESTINATION share/libwebsockets-test-server/plugins
-               COMPONENT plugins)
-if (LWS_WITH_SERVER_STATUS)
-       install(FILES plugins/server-status.html;plugins/lwsws-logo.png
-               DESTINATION share/libwebsockets-test-server/server-status
-                       COMPONENT examples)
-endif()
-if (LWS_WITH_GENERIC_SESSIONS)
-       install(FILES
-                     plugins/generic-sessions/assets/lwsgs-logo.png
-                     plugins/generic-sessions/assets/seats.jpg
-                     plugins/generic-sessions/assets/failed-login.html
-                     plugins/generic-sessions/assets/lwsgs.js
-                     plugins/generic-sessions/assets/post-register-fail.html
-                     plugins/generic-sessions/assets/post-register-ok.html
-                     plugins/generic-sessions/assets/post-verify-ok.html
-                     plugins/generic-sessions/assets/post-verify-fail.html
-                     plugins/generic-sessions/assets/sent-forgot-ok.html
-                     plugins/generic-sessions/assets/sent-forgot-fail.html
-                     plugins/generic-sessions/assets/post-forgot-ok.html
-                     plugins/generic-sessions/assets/post-forgot-fail.html
-                     plugins/generic-sessions/assets/index.html
-               DESTINATION share/libwebsockets-test-server/generic-sessions
-                       COMPONENT examples)
-       install(FILES plugins/generic-sessions/assets/successful-login.html 
-               DESTINATION share/libwebsockets-test-server/generic-sessions/needauth
-                       COMPONENT examples)
-       install(FILES plugins/generic-sessions/assets/admin-login.html
-               DESTINATION share/libwebsockets-test-server/generic-sessions/needadmin
-                       COMPONENT examples)
+if (DEFINED OPENSSL_INCLUDE_DIRS)
+       set(LWS__INCLUDE_DIRS "${LWS__INCLUDE_DIRS};${OPENSSL_INCLUDE_DIRS}")
 endif()
 
-endif()
+configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
+                ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libwebsockets-config.cmake
+                @ONLY)
+
+set_target_properties(${LWS_LIBRARIES}
+               PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")
 
 # Install the LibwebsocketsConfig.cmake and LibwebsocketsConfigVersion.cmake
 install(FILES
-               "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibwebsocketsConfig.cmake"
-               "${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake"
+               "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libwebsockets-config.cmake"
+               "${PROJECT_BINARY_DIR}/libwebsockets-config-version.cmake"
+               "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LwsCheckRequirements.cmake"
                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)
-endif()
-
-message("---------------------------------------------------------------------")
-message("  Settings:  (For more help do cmake -LH <srcpath>)")
-message("---------------------------------------------------------------------")
-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_WOLFSSL_LIBRARIES = ${LWS_WOLFSSL_LIBRARIES}")
-       message("   LWS_WOLFSSL_INCLUDE_DIRS = ${LWS_WOLFSSL_INCLUDE_DIRS}")
-endif()
-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}")
-message(" LWS_WITHOUT_SERVER = ${LWS_WITHOUT_SERVER}")
-message(" LWS_LINK_TESTAPPS_DYNAMIC = ${LWS_LINK_TESTAPPS_DYNAMIC}")
-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_IPV6 = ${LWS_IPV6}")
-message(" LWS_UNIX_SOCK = ${LWS_UNIX_SOCK}")
-message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
-message(" LWS_MBED3 = ${LWS_MBED3}")
-message(" LWS_SSL_SERVER_WITH_ECDH_CERT = ${LWS_SSL_SERVER_WITH_ECDH_CERT}")
-message(" LWS_MAX_SMP = ${LWS_MAX_SMP}")
-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_WITH_HTTP_PROXY = ${LWS_WITH_HTTP_PROXY}")
-message(" LIBHUBBUB_LIBRARIES = ${LIBHUBBUB_LIBRARIES}")
-message(" PLUGINS = ${PLUGINS_LIST}")
-message(" LWS_WITH_ACCESS_LOG = ${LWS_WITH_ACCESS_LOG}")
-message(" LWS_WITH_SERVER_STATUS = ${LWS_WITH_SERVER_STATUS}")
-message(" LWS_WITH_LEJP = ${LWS_WITH_LEJP}")
-message(" LWS_WITH_LEJP_CONF = ${LWS_WITH_LEJP_CONF}")
-message(" LWS_WITH_SMTP = ${LWS_WITH_SMTP}")
-message(" LWS_WITH_GENERIC_SESSIONS = ${LWS_WITH_GENERIC_SESSIONS}")
-
-
-message("---------------------------------------------------------------------")
-
-# These will be available to parent projects including libwebsockets using add_subdirectory()
-set(LIBWEBSOCKETS_LIBRARIES ${LWS_LIBRARIES} CACHE STRING "Libwebsocket libraries")
-if (LWS_WITH_STATIC)
-       set(LIBWEBSOCKETS_LIBRARIES_STATIC websocket CACHE STRING "Libwebsocket static library")
-endif()
-if (LWS_WITH_SHARED)
-       set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library")
-endif()
+
 
 # This must always be last!
 include(CPack)