Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-16 00:00:07 +01:00
Code Issues Releases Wiki Activity
libwebsockets/CMakeLists.txt

2784 lines
85 KiB
Text
Raw Permalink Normal View History

Added option to build the static library with PIC
2016-09-27 05:32:40 +08:00
cmake_minimum_required(VERSION 2.8.9)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
hpack: pseudoheader check improvement
2017-11-10 08:56:44 +08:00
# General Advice
#
# For selecting between DEBUG / RELEASE, use -DCMAKE_BUILD_TYPE=DEBUG or =RELEASE
# debug builds include source level debug info and extra logging
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
set(LWS_WITH_BUNDLED_ZLIB_DEFAULT OFF)
if(WIN32)
set(LWS_WITH_BUNDLED_ZLIB_DEFAULT ON)
endif()
refactor: move all ah and http specific vars to http private and conditional inclusion from there
2018-04-27 15:20:56 +08:00
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
set(LWS_ROLE_RAW 1)
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
set(LWS_WITH_POLL 1)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
LWS_WITH_DISTRO_RECOMMENDED Idea from Per Bothner https://libwebsockets.org/pipermail/libwebsockets/2018-January/003635.html
2018-01-27 08:01:33 +08:00
#
# Select features recommended for PC distro packaging
#
option(LWS_WITH_DISTRO_RECOMMENDED "Enable features recommended for distro packaging" OFF)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_FOR_GITOHASHI "Enable features recommended for use with gitohashi" OFF)
LWS_WITH_DISTRO_RECOMMENDED Idea from Per Bothner https://libwebsockets.org/pipermail/libwebsockets/2018-January/003635.html
2018-01-27 08:01:33 +08:00
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
#
# Major individual features
#
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
option(LWS_WITH_NETWORK "Compile with network-related code" ON)
refactor: move all ah and http specific vars to http private and conditional inclusion from there
2018-04-27 15:20:56 +08:00
option(LWS_ROLE_H1 "Compile with support for http/1 (needed for ws)" ON)
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
option(LWS_ROLE_WS "Compile with support for websockets" ON)
role: dbus This adds support for the integrating libdbus into the lws event loop. Unlike the other roles, lws doesn't completely adopt the fd and libdbus insists to retain control over the fd lifecycle. However libdbus provides apis for foreign code (lws) to provide event loop services to libdbus for the fd. Accordingly, unlike the other roles rx and writeable are not subsumed into lws callback messages and the events remain the property of libdbus. A context struct wrapper is provided that is available in the libdbus callbacks to bridge between the lws and dbus worlds, along with a minimal example dbus client and server.
2018-10-02 10:50:24 +08:00
option(LWS_ROLE_DBUS "Compile with support for DBUS" OFF)
role: raw-proxy
2018-11-29 08:29:48 +08:00
option(LWS_ROLE_RAW_PROXY "Raw packet proxy" OFF)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_WITH_HTTP2 "Compile with server support for HTTP/2" ON)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
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)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions" OFF)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_WITH_HTTP_PROXY "Support for HTTP proxying" OFF)
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF)
option(LWS_WITH_GENERIC_SESSIONS "With the Generic Sessions plugin" OFF)
option(LWS_WITH_PEER_LIMITS "Track peers and restrict resources a single peer can allocate" OFF)
option(LWS_WITH_ACCESS_LOG "Support generating Apache-compatible access logs" OFF)
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
option(LWS_WITH_RANGES "Support http ranges (RFC7233)" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_SERVER_STATUS "Support json + jscript server monitoring" OFF)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_WITH_THREADPOOL "Managed worker thread pool support (relies on pthreads)" OFF)
http: compression methods Add generic http compression layer eanbled at cmake with LWS_WITH_HTTP_STREAM_COMPRESSION. This is wholly a feature of the HTTP role (used by h1 and h2 roles) and doesn't exist outside that context. Currently provides 'deflate' and 'br' compression methods for server side only. 'br' requires also -DLWS_WITH_HTTP_BROTLI=1 at cmake and the brotli libraries (available in your distro already) and dev package. Other compression methods can be added nicely using an ops struct. The built-in file serving stuff will use this is the client says he can handle it, and the mimetype of the file either starts with "text/" (html and css etc) or is the mimetype of Javascript. zlib allocates quite a bit while in use, it seems to be around 256KiB per stream. So this is only useful on relatively strong servers with lots of memory. However for some usecases where you are serving a lot of css and js assets, it's a nice help. The patch performs special treatment for http/1.1 pipelining, since the compression is performed on the fly the compressed content-length is not known until the end. So for h1 only, chunked transfer-encoding is automatically added so pipelining can continue of the connection. For h2 the chunking is neither supported nor required, so it "just works". User code can also request to add a compression transform before the reply headers were sent using the new api LWS_VISIBLE int lws_http_compression_apply(struct lws *wsi, const char *name, unsigned char **p, unsigned char *end, char decomp); ... this allows transparent compression of dynamically generated HTTP. The requested compression (eg, "deflate") is only applied if the client headers indicated it was supported, otherwise it's a NOP. Name may be NULL in which case the first compression method in the internal table at stream.c that is mentioned as acceptable by the client will be used. NOTE: the compression translation, same as h2 support, relies on the user code using LWS_WRITE_HTTP and then LWS_WRITE_HTTP_FINAL on the last part written. The internal lws fileserving code already does this.
2018-09-02 14:43:05 +08:00
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)
ACME client plugin This adds support for a plugin that can be attached to a vhost to acquire and maintain its TLS cert automatically. It works the same with both OpenSSL and mbedTLS backends, but they can't share auth keys, delete the 'auth.jwk' file as it is in the example JSON when switching between libs
2017-10-21 06:36:35 +08:00
option(LWS_WITH_ACME "Enable support for ACME automatic cert acquisition + maintenance (letsencrypt etc)" OFF)
http proxy: client: unix socket support This allows the client stuff to understand that addresses beginning with '+' represent unix sockets. If the first character after the '+' is '@', it understands that the '@' should be read as '\0', in order to use Linux "abstract namespace" sockets. Further the lws_parse_uri() helper is extended to understand the convention that an address starting with + is a unix socket, and treats the socket path as delimited by ':', eg http://+/var/run/mysocket:/my/path HTTP Proxy is updated to allow mounts to these unix socket paths. Proxy connections go out on h1, but are dynamically translated to h1 or h2 on the incoming side. Proxy usage of libhubbub is separated out... LWS_WITH_HTTP_PROXY is on by default, and LWS_WITH_HUBBUB is off by default.
2018-09-04 08:06:46 +08:00
option(LWS_WITH_HUBBUB "Enable libhubbub rewriting support" OFF)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_WITH_FTS "Full Text Search support" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
#
# TLS library options... all except mbedTLS are basically OpenSSL variants.
#
option(LWS_WITH_SSL "Include SSL support (defaults to OpenSSL or similar, mbedTLS if LWS_WITH_MBEDTLS is set)" ON)
option(LWS_WITH_MBEDTLS "Use mbedTLS (>=2.0) replacement for OpenSSL. When setting this, you also may need to specify LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS" OFF)
option(LWS_WITH_BORINGSSL "Use BoringSSL replacement for OpenSSL" OFF)
option(LWS_WITH_CYASSL "Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF)
option(LWS_WITH_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF)
option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of the OS-installed CA root certs" ON)
#
# Event library options (may select multiple, or none for default poll()
#
option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
option(LWS_WITH_LIBUV "Compile with support for libuv" OFF)
option(LWS_WITH_LIBEVENT "Compile with support for libevent" OFF)
#
# Static / Dynamic build options
#
option(LWS_WITH_STATIC "Build the static version of the library" ON)
option(LWS_WITH_SHARED "Build the shared version of the library" ON)
option(LWS_LINK_TESTAPPS_DYNAMIC "Link the test apps to the shared version of the library. Default is to link statically" OFF)
option(LWS_STATIC_PIC "Build the static version of the library with position-independent code" OFF)
#
# Specific platforms
#
option(LWS_WITH_ESP32 "Build for ESP32" OFF)
esp32: do not compile esp32-helper by default ...as it is highly coupled with other ESP-IDF components and should be written
2019-07-01 14:56:02 +01:00
option(LWS_WITH_ESP32_HELPER "Build ESP32 helper" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_PLAT_OPTEE "Build for OPTEE" OFF)
#
# Client / Server / Test Apps build control
#
option(LWS_WITHOUT_CLIENT "Don't build the client part of the library" OFF)
option(LWS_WITHOUT_SERVER "Don't build the server part of the library" OFF)
option(LWS_WITHOUT_TESTAPPS "Don't build the libwebsocket-test-apps" OFF)
option(LWS_WITHOUT_TEST_SERVER "Don't build the test server" OFF)
option(LWS_WITHOUT_TEST_SERVER_EXTPOLL "Don't build the test server version that uses external poll" OFF)
option(LWS_WITHOUT_TEST_PING "Don't build the ping test application" OFF)
option(LWS_WITHOUT_TEST_CLIENT "Don't build the client test application" OFF)
#
# Extensions (permessage-deflate)
#
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
option(LWS_WITHOUT_EXTENSIONS "Don't compile with extensions" ON)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
#
# Helpers + misc
#
option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use the BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... The default is to assume that your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
option(LWS_FALLBACK_GETHOSTBYNAME "Also try to do dns resolution using gethostbyname if getaddrinfo fails" OFF)
option(LWS_WITHOUT_BUILTIN_SHA1 "Don't build the lws sha-1 (eg, because openssl will provide it" OFF)
option(LWS_WITH_LATENCY "Build latency measuring code into the library" OFF)
option(LWS_WITHOUT_DAEMONIZE "Don't build the daemonization api" ON)
option(LWS_SSL_SERVER_WITH_ECDH_CERT "Include SSL server use ECDH certificate" OFF)
cmake: LEJF and LEJP_CONF now on by default
2018-08-05 18:18:40 +08:00
option(LWS_WITH_LEJP "With the Lightweight JSON Parser" ON)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_SQLITE3 "Require SQLITE3 support" OFF)
lws_struct lws_struct JSON + sqlite3 serializer and deserializer See READMEs/README.lws_struct.md
2019-03-30 22:14:15 +08:00
option(LWS_WITH_STRUCT_JSON "Generic struct serialization to and from JSON" ON)
option(LWS_WITH_STRUCT_SQLITE3 "Generic struct serialization to and from SQLITE3" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_SMTP "Provide SMTP support" OFF)
lws_dir: wrap dir scanning backend and convert lejp-conf We use POSIX dir scanning apis normally, but for windows, we require libuv to do it for us. Formalize that into a wrapper lws_dir() that hides the backend code. Make it configurable, ON by default and forced on with lejp-conf that depends on it.
2019-03-14 08:24:40 +08:00
if (WIN32 OR LWS_WITH_ESP32)
option(LWS_WITH_DIR "Directory scanning api support" OFF)
jwk: remove unistd.h include
2019-03-14 21:22:17 +08:00
option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF)
lws_dir: wrap dir scanning backend and convert lejp-conf We use POSIX dir scanning apis normally, but for windows, we require libuv to do it for us. Formalize that into a wrapper lws_dir() that hides the backend code. Make it configurable, ON by default and forced on with lejp-conf that depends on it.
2019-03-14 08:24:40 +08:00
else()
option(LWS_WITH_DIR "Directory scanning api support" ON)
jwk: remove unistd.h include
2019-03-14 21:22:17 +08:00
option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" ON)
lws_dir: wrap dir scanning backend and convert lejp-conf We use POSIX dir scanning apis normally, but for windows, we require libuv to do it for us. Formalize that into a wrapper lws_dir() that hides the backend code. Make it configurable, ON by default and forced on with lejp-conf that depends on it.
2019-03-14 08:24:40 +08:00
endif()
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_NO_LOGS "Disable all logging from being compiled in" OFF)
option(LWS_AVOID_SIGPIPE_IGN "Android 7+ reportedly needs this" OFF)
option(LWS_WITH_STATS "Keep statistics of lws internal operations" OFF)
jwe
2018-12-13 20:05:12 +08:00
option(LWS_WITH_JOSE "JSON Web Signature / Encryption / Keys (RFC7515/6/) API" OFF)
option(LWS_WITH_GENCRYPTO "Enable support for Generic Crypto apis independent of TLS backend" OFF)
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
option(LWS_WITH_SELFTESTS "Selftests run at context creation" OFF)
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
option(LWS_WITH_GCOV "Build with gcc gcov coverage instrumentation" OFF)
Add a flag to disable CMake exports Add LWS_EXPORT_LWSTARGETS (defaults to ON) that can be used to disable CMake export targets as well as install export for libwebsockets. AG: add _WITH_
2017-11-20 12:41:29 +01:00
option(LWS_WITH_EXPORT_LWSTARGETS "Export libwebsockets CMake targets. Disable if they conflict with an outer cmake project." ON)
CMakeLists: build reproducible by default Using the build user and build hostname as part of the git hash breaks reproducible builds. Make this part optional, but build reproducible by default.
2017-12-10 00:54:06 +01:00
option(LWS_REPRODUCIBLE "Build libwebsockets reproducible. It removes the build user and hostname from the build" ON)
LWS_WITH_MINIMAL_EXAMPLES: default-off build all minimal samples after lws for QA This adds an lws cmake option that builds all the minimal examples as part of lws, it's useful for QA. It adds a macro to examples that depend on a particular lws configuration to understand they should just null out their project definition in builds where the lws configuration requirement is not met, and we are building as part of lws. It also adapts all the example library additions to select the just-built-but-not-yet-installed library in the case it is built as part of lws. If built standalone, it now uses the cmake platform-abstracted way to add the library requirement too.
2018-03-17 06:43:12 +08:00
option(LWS_WITH_MINIMAL_EXAMPLES "Also build the normally standalone minimal examples, for QA" OFF)
lwsac Introduce an api for efficiently dealing with allocations for large, unknown amounts of objects.
2018-10-14 06:12:27 +08:00
option(LWS_WITH_LWSAC "lwsac Chunk Allocation api" ON)
ah: custom headers for h1 Until now lws only parses headers it knows at build-time from its prebuilt lexical analyzer. This adds an on-by-default cmake option and a couple of apis to also store and query "custom", ie, unknown-to-lws headers. A minimal example is also provided. At the moment it only works on h1, h2 support needs improvements to the hpack implementation. Since it bloats ah memory usage compared to without it if custom headers are present, the related code and ah footprint can be disabled with the cmake option LWS_WITH_CUSTOM_HEADERS, but it's on by default normally. ESP32 platform disables it. https://github.com/warmcat/libwebsockets/pull/1499
2019-02-26 17:18:24 +08:00
option(LWS_WITH_CUSTOM_HEADERS "Store and allow querying custom HTTP headers (H1 only)" ON)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
option(LWS_WITH_DISKCACHE "Hashed cache directory with lazy LRU deletion to size limit" OFF)
LWS_WITH_ASAN This lets you build using the runtime Address Sanitizer in gcc. LWS is heavily tested with valgrind routinely during development. But ASAN did find some theoretical-only issues with shifting, strictly ~(1 << 31) is a signed int, it should be ~(1u << 31). Gcc does the same for both, but it's good to have the ability to find these.
2018-11-03 14:47:48 +08:00
option(LWS_WITH_ASAN "Build with gcc runtime sanitizer options enabled (needs libasan)" OFF)
esp32: do not compile directory scanning stuff
2019-07-01 14:54:05 +01:00
option(LWS_WITH_DIR "Directory scanning api support" OFF)
option(LWS_WITH_LEJP_CONF "With LEJP configuration parser as used by lwsws" OFF)
cmake: miniz: add as option
2019-07-03 19:46:23 +01:00
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)
lws_dll: upgrade all instances to lws_dll2 lws_dll2 removes the downsides of lws_dll and adds new features like a running member count and explicit owner type... it's cleaner and more robust (eg, nodes know their owner, so they can casually switch between list owners and remove themselves without the code knowing the owner). This deprecates lws_dll, but since it's public it allows it to continue to be built for 4.0 release if you give cmake LWS_WITH_DEPRECATED_LWS_DLL. All remaining internal users of lws_dll are migrated to lws_dll2.
2019-08-08 16:58:55 +01:00
option(LWS_WITH_DEPRECATED_LWS_DLL "Migrate to lws_dll2 instead ASAP" OFF)
seq: LWS_WITH_SEQUENCER default-on force off if NO_NETWORK (which is tested in travis)
2019-08-09 09:14:48 +01:00
option(LWS_WITH_SEQUENCER "lws_seq_t support" ON)
external poll: add default-off cmake option External poll support generates a lot of messages on a busy system for no value unless you're one of the few people using it. It's not recommended for new users and is there for backwards compatibility. Make it not built by default and selectable by cmake option.
2019-08-10 09:33:07 +01:00
option(LWS_WITH_EXTERNAL_POLL "Support external POLL integration using callback messages (not recommended)" OFF)
lws_dsh
2019-08-11 06:47:19 +01:00
option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF)
cmake: miniz: add as option
2019-07-03 19:46:23 +01:00
#
# to use miniz, enable both LWS_WITH_ZLIB and LWS_WITH_MINIZ
cmake: refactor options into groups and move to top of file
2017-10-21 09:03:42 +08:00
#
# End of user settings
#
CMakeList: detect ESP_PLATFORM for ESP32
2019-07-01 14:48:43 +01:00
# Workaround for ESP-IDF
# Detect ESP_PLATFORM environment flag, if exist, set LWS_WITH_ESP32.
# Otherwise the user may not be able to run configuration ESP-IDF in the first time.
if(ESP_PLATFORM)
esp32: do not compile directory scanning stuff
2019-07-01 14:54:05 +01:00
message(STATUS "ESP-IDF enabled")
CMakeList: detect ESP_PLATFORM for ESP32
2019-07-01 14:48:43 +01:00
set(LWS_WITH_ESP32 ON)
esp32: do not compile esp32-helper by default ...as it is highly coupled with other ESP-IDF components and should be written
2019-07-01 14:56:02 +01:00
else()
set(LWS_WITH_ESP32_HELPER OFF)
CMakeList: detect ESP_PLATFORM for ESP32
2019-07-01 14:48:43 +01:00
endif()
esp32: do not compile directory scanning stuff
2019-07-01 14:54:05 +01:00
if (WIN32 OR LWS_WITH_ESP32)
message(STATUS "No LWS_WITH_DIR and LWS_WITH_DIR")
set(LWS_WITH_DIR OFF)
set(LWS_WITH_LEJP_CONF OFF)
message("LWS_WITH_DIR ${LWS_WITH_DIR}")
else()
message(STATUS "Compiled with LWS_WITH_DIR and LWS_WITH_DIR")
set(LWS_WITH_DIR ON)
set(LWS_WITH_LEJP_CONF ON)
endif()
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
if (LWS_FOR_GITOHASHI)
set(LWS_WITH_THREADPOOL 1)
set(LWS_WITH_HTTP2 1)
set(LWS_UNIX_SOCK 1)
set(LWS_WITH_HTTP_PROXY 1)
set(LWS_WITH_FTS 1)
set(LWS_WITH_DISKCACHE 1)
set(LWS_WITH_LWSAC 1)
set(LWS_WITH_LEJP_CONF 1)
endif()
LWS_WITH_DISTRO_RECOMMENDED Idea from Per Bothner https://libwebsockets.org/pipermail/libwebsockets/2018-January/003635.html
2018-01-27 08:01:33 +08:00
if(LWS_WITH_DISTRO_RECOMMENDED)
set(LWS_WITH_HTTP2 1)
set(LWS_WITH_LWSWS 1)
set(LWS_WITH_CGI 1)
set(LWS_IPV6 1)
set(LWS_WITH_ZIP_FOPS 1)
set(LWS_WITH_SOCKS5 1)
set(LWS_WITH_RANGES 1)
set(LWS_WITH_ACME 1)
set(LWS_WITH_SERVER_STATUS 1)
set(LWS_WITH_LIBUV 1)
set(LWS_WITH_LIBEV 1)
libev: libevent conflicts at buildtime
2018-02-19 10:39:01 +08:00
# libev + libevent cannot coexist at build-time
set(LWS_WITH_LIBEVENT 0)
LWS_WITH_DISTRO_RECOMMENDED Idea from Per Bothner https://libwebsockets.org/pipermail/libwebsockets/2018-January/003635.html
2018-01-27 08:01:33 +08:00
set(LWS_WITHOUT_EXTENSIONS 0)
role: dbus This adds support for the integrating libdbus into the lws event loop. Unlike the other roles, lws doesn't completely adopt the fd and libdbus insists to retain control over the fd lifecycle. However libdbus provides apis for foreign code (lws) to provide event loop services to libdbus for the fd. Accordingly, unlike the other roles rx and writeable are not subsumed into lws callback messages and the events remain the property of libdbus. A context struct wrapper is provided that is available in the libdbus callbacks to bridge between the lws and dbus worlds, along with a minimal example dbus client and server.
2018-10-02 10:50:24 +08:00
set(LWS_ROLE_DBUS 1)
fulltext search
2018-10-14 11:38:08 +08:00
set(LWS_WITH_FTS 1)
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
set(LWS_WITH_THREADPOOL 1)
set(LWS_UNIX_SOCK 1)
set(LWS_WITH_HTTP_PROXY 1)
set(LWS_WITH_DISKCACHE 1)
set(LWS_WITH_LWSAC 1)
v3.1.0
2018-11-23 11:30:56 +08:00
set(LWS_WITH_LEJP_CONF 1)
set(LWS_WITH_PLUGINS 1)
role: raw-proxy
2018-11-29 08:29:48 +08:00
set(LWS_ROLE_RAW_PROXY 1)
jwe
2018-12-13 20:05:12 +08:00
set(LWS_WITH_GENCRYPTO 1)
set(LWS_WITH_JOSE 1)
LWS_WITH_DISTRO_RECOMMENDED Idea from Per Bothner https://libwebsockets.org/pipermail/libwebsockets/2018-January/003635.html
2018-01-27 08:01:33 +08:00
endif()
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (NOT LWS_WITH_NETWORK)
set(LWS_ROLE_H1 0)
set(LWS_ROLE_WS 0)
set(LWS_ROLE_RAW 0)
set(LWS_WITHOUT_EXTENSIONS 1)
set(LWS_WITHOUT_SERVER 1)
set(LWS_WITHOUT_CLIENT 1)
set(LWS_WITH_HTTP2 0)
set(LWS_WITH_SOCKS5 0)
set(LWS_UNIX_SOCK 0)
set(LWS_WITH_HTTP_PROXY 0)
set(LWS_WITH_PLUGINS 0)
set(LWS_WITH_LWSWS 0)
set(LWS_WITH_CGI 0)
set(LWS_ROLE_RAW_PROXY 0)
set(LWS_WITH_PEER_LIMITS 0)
set(LWS_WITH_GENERIC_SESSIONS 0)
set(LWS_WITH_HTTP_STREAM_COMPRESSION 0)
set(LWS_WITH_HTTP_BROTLI 0)
set(LWS_WITH_POLL 0)
seq: LWS_WITH_SEQUENCER default-on force off if NO_NETWORK (which is tested in travis)
2019-08-09 09:14:48 +01:00
set(LWS_WITH_SEQUENCER 0)
sul: all timed objects use a single pt sul list wsi timeout, wsi hrtimer, sequencer timeout and vh-protocol timer all now participate on a single sorted us list. The whole idea of polling wakes is thrown out, poll waits ignore the timeout field and always use infinite timeouts. Introduce a public api that can schedule its own callback from the event loop with us resolution (usually ms is all the platform can do). Upgrade timeouts and sequencer timeouts to also be able to use us resolution. Introduce a prepared fakewsi in the pt, so we don't have to allocate one on the heap when we need it. Directly handle vh-protocol timer if LWS_MAX_SMP == 1
2019-08-09 10:12:09 +01:00
set(LWS_ROLE_DBUS 0)
lws_dsh
2019-08-11 06:47:19 +01:00
set(LWS_WITH_LWS_DSH 0)
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
endif()
lws_struct lws_struct JSON + sqlite3 serializer and deserializer See READMEs/README.lws_struct.md
2019-03-30 22:14:15 +08:00
if (LWS_WITH_STRUCT_SQLITE3)
set(LWS_WITH_SQLITE3 1)
endif()
dbus-ws-proxy This builds on the new dbus role support to provide a minimal example proxy between ws and dbus. A client app is provided that asks the proxy to connect to libwebsockets.org and proxy the drawing data from the mirror example there back to the dbus client using dbus messages.
2018-10-03 14:14:29 +08:00
# do you care about this? Then send me a patch where it disables it on travis
# but allows it on APPLE
if (APPLE)
set(LWS_ROLE_DBUS 0)
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if(NOT DEFINED CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
endif()
http proxy: client: unix socket support This allows the client stuff to understand that addresses beginning with '+' represent unix sockets. If the first character after the '+' is '@', it understands that the '@' should be read as '\0', in order to use Linux "abstract namespace" sockets. Further the lws_parse_uri() helper is extended to understand the convention that an address starting with + is a unix socket, and treats the socket path as delimited by ':', eg http://+/var/run/mysocket:/my/path HTTP Proxy is updated to allow mounts to these unix socket paths. Proxy connections go out on h1, but are dynamically translated to h1 or h2 on the incoming side. Proxy usage of libhubbub is separated out... LWS_WITH_HTTP_PROXY is on by default, and LWS_WITH_HUBBUB is off by default.
2018-09-04 08:06:46 +08:00
# microsoft... that's why you can't have nice things
if (WIN32 OR LWS_WITH_ESP32)
set(LWS_UNIX_SOCK 0)
endif()
lwsac Introduce an api for efficiently dealing with allocations for large, unknown amounts of objects.
2018-10-14 06:12:27 +08:00
if (LWS_WITH_ESP32)
set(LWS_WITH_LWSAC 0)
fulltext search
2018-10-14 11:38:08 +08:00
set(LWS_WITH_FTS 0)
lwsac Introduce an api for efficiently dealing with allocations for large, unknown amounts of objects.
2018-10-14 06:12:27 +08:00
endif()
Subject: [PATCH] cmake: set the project language By default, CMake sets C and C++ as languages used by the project. This makes the configuration failed if no C++ compiler is found. Since libwesockets in written in pure C, no C++, there is no reason to disable it when the toolchain has no C++ support. This patch just make the CMake code reflecting the real status of the project with regard to the languages used. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
2014-05-02 14:24:58 +02:00
project(libwebsockets C)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(PACKAGE "libwebsockets")
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
set(CPACK_PACKAGE_NAME "${PACKAGE}")
prepare for new release
2018-05-04 13:27:12 +08:00
set(CPACK_PACKAGE_VERSION_MAJOR "3")
v3.2.0
2019-08-14 09:22:50 +01:00
set(CPACK_PACKAGE_VERSION_MINOR "2")
v3.2.3
2020-05-06 18:25:03 +01:00
set(CPACK_PACKAGE_VERSION_PATCH "3")
v3.1.0
2018-11-23 11:30:56 +08:00
set(CPACK_PACKAGE_RELEASE 1)
set(CPACK_GENERATOR "RPM")
Subject: [PATCH] Add LWS_LIBRARY_VERSION_NUMBER to lws_config.h. This changeset adds a few preprocessor macros to lws_config.h to allow a user of libwebsockets to determine at compile time which version of lws they are compiling against. This exposes the already existing LWS_LIBRARY_VERSION_MAJOR and _MINOR values, and adds LWS_LIBRARY_VERSION_PATCH. This suggests that future minor bugfix release versions of lws would be e.g. 1.6.0 -> 1.6.1 rather than the style used previously: 1.2 -> 1.21. The way this is currently set up means new minor revisions (with _PATCH==0) always end with .0 but I could change this if preferred. The most important addition is LWS_LIBRARY_VERSION_NUMBER, which produces a number of the form 1005001 for version 1.5.1 - i.e. each part major, minor, patch can extend from 0-999. This macro allows a very easy compile time comparison of version numbers.
2015-12-14 17:25:29 +00:00
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
v3.1.0
2018-11-23 11:30:56 +08:00
set(CPACK_PACKAGE_CONTACT "andy@warmcat.com")
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
v3.2.0
2019-08-14 09:22:50 +01:00
set(SOVERSION "15")
Better support for MINW32
2016-11-07 21:36:05 +01:00
if(NOT CPACK_GENERATOR)
if(UNIX)
set(CPACK_GENERATOR "TGZ")
else()
set(CPACK_GENERATOR "ZIP")
endif()
endif()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
set(VERSION "${CPACK_PACKAGE_VERSION}")
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
set(LWS_LIBRARY_VERSION ${CPACK_PACKAGE_VERSION})
Subject: [PATCH] Add LWS_LIBRARY_VERSION_NUMBER to lws_config.h. This changeset adds a few preprocessor macros to lws_config.h to allow a user of libwebsockets to determine at compile time which version of lws they are compiling against. This exposes the already existing LWS_LIBRARY_VERSION_MAJOR and _MINOR values, and adds LWS_LIBRARY_VERSION_PATCH. This suggests that future minor bugfix release versions of lws would be e.g. 1.6.0 -> 1.6.1 rather than the style used previously: 1.2 -> 1.21. The way this is currently set up means new minor revisions (with _PATCH==0) always end with .0 but I could change this if preferred. The most important addition is LWS_LIBRARY_VERSION_NUMBER, which produces a number of the form 1005001 for version 1.5.1 - i.e. each part major, minor, patch can extend from 0-999. This macro allows a very easy compile time comparison of version numbers.
2015-12-14 17:25:29 +00:00
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})
move cms cmake addition to cmake module paths earlier Signed-off-by: Edwin van den Oetelaar <oetelaar.automatisering@gmail.com>
2013-02-18 20:20:05 +08:00
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
v3.1.0
2018-11-23 11:30:56 +08:00
cmake improve cross documentation Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-30 10:30:03 +08:00
message(STATUS "CMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'")
windows: add version resource
2018-02-05 15:33:36 +01:00
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()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
# Try to find the current Git hash.
find_package(Git)
if(GIT_EXECUTABLE)
execute_process(
CMakeLists: build reproducible by default Using the build user and build hostname as part of the git hash breaks reproducible builds. Make this part optional, but build reproducible by default.
2017-12-10 00:54:06 +01:00
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
cmake: git describe --tags
2018-05-15 12:44:31 +08:00
COMMAND "${GIT_EXECUTABLE}" describe --tags
CMakeLists: build reproducible by default Using the build user and build hostname as part of the git hash breaks reproducible builds. Make this part optional, but build reproducible by default.
2017-12-10 00:54:06 +01:00
OUTPUT_VARIABLE GIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(LWS_BUILD_HASH ${GIT_HASH})
cmake: git describe --tags
2018-05-15 12:44:31 +08:00
# append the build user and hostname
CMakeLists: build reproducible by default Using the build user and build hostname as part of the git hash breaks reproducible builds. Make this part optional, but build reproducible by default.
2017-12-10 00:54:06 +01:00
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}")
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
endif()
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
# translate old functionality enables to set up ROLE enables so nothing changes
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
if (LWS_WITH_HTTP2 AND LWS_WITHOUT_SERVER)
set(LWS_WITH_HTTP2 0)
message("HTTP2 disabled due to LWS_WITHOUT_SERVER")
endif()
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
if (LWS_WITH_HTTP2)
set(LWS_ROLE_H2 1)
endif()
if (LWS_WITH_CGI)
set(LWS_ROLE_CGI 1)
endif()
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
if (NOT LWS_ROLE_WS)
set(LWS_WITHOUT_EXTENSIONS 1)
endif()
fulltext search
2018-10-14 11:38:08 +08:00
include_directories(include plugins)
libwebsockets.h: split out into a dir of sub-includes included by libwebsockets.h This has no effect on user code or backward compatibility. It moves the in-tree public api header libwebsockets.h from ./lib to ./include, and introduces a dir ./include/libwebsockets/ The single public api header is split out into 31 sub-headers in ./include/libwebsockets. ./include/libwebsockets.h contains some core types and platform adaptation code, but the rest of it is now 31 #include <libwebsockets/...> At install time, /usr/[local/]include/libwebsockets.h is installed as before, along now with the 31 sub-headers in ...include/libwebsockets/ There's no net effect on user code. But the api header is now much easier to maintain and study, with 31 topic-based sub headers.
2018-08-23 09:46:01 +08:00
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
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)
lws access log option and lwsws conf This adds the ability to store apache-compatible logs to a file given at vhost-creation time. lwsws conf can set it per-vhost using "access-log": "<filepath>" The feature defaults to disabled at cmake, it can be set independently but LWS_WITH_LWSWS set it on. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 12:00:23 +08:00
set(LWS_WITH_ACCESS_LOG 1)
plugin lws server status Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 14:01:29 +08:00
set(LWS_WITH_SERVER_STATUS 1)
lejp bring into lws lejp is already in lws as part of lwsws. However it's too generally useful to just put directly in lwsws, it will lead to multiple copies of the source in differet subprojects. This moves it directly into lws, lwsws now gets it from there. Like lwsws, by default at cmake it is disabled. Selecting LWS_WITH_LWSWS now selects LWS_WITH_LEJP and you can set that at cmake individually as well. Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-10 09:47:10 +08:00
set(LWS_WITH_LEJP 1)
lwsws conf.c migrate to lib Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-26 21:12:11 +08:00
set(LWS_WITH_LEJP_CONF 1)
LWS_WITH_PEER_LIMITS Introduces an optional, settable restriction on the number of simultaneous wsi connections and ah that a single peer IP can obtain. The default is disabled for build, and if enabled, unlimited. However when enabled at CMake, setting info.ip_limit_ah and / or info.ip_limit_wsi at context creation time will enforce the limits. Connections past the info.ip_limit_wsi limit are dropped, and connections needing an ah are forced to stay in the ah waiting list even when ah are available, while the peer is at the number of ah in info.ip_limit_ah.
2017-09-14 13:14:11 +08:00
set(LWS_WITH_PEER_LIMITS 1)
role: raw-proxy
2018-11-29 08:29:48 +08:00
set(LWS_ROLE_RAW_PROXY 1)
endif()
jwe
2018-12-13 20:05:12 +08:00
# sshd plugin
if (LWS_WITH_PLUGINS)
set(LWS_WITH_GENCRYPTO 1)
endif()
role: raw-proxy
2018-11-29 08:29:48 +08:00
if (LWS_ROLE_RAW_PROXY)
set (LWS_WITHOUT_CLIENT 0)
set (LWS_WITHOUT_SERVER 0)
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
endif()
ssl add ECDH server support (AG clean style add option flag and docs)
2016-01-15 16:21:51 +08:00
ACME client plugin This adds support for a plugin that can be attached to a vhost to acquire and maintain its TLS cert automatically. It works the same with both OpenSSL and mbedTLS backends, but they can't share auth keys, delete the 'auth.jwk' file as it is in the example JSON when switching between libs
2017-10-21 06:36:35 +08:00
if (LWS_WITH_ACME)
set (LWS_WITHOUT_CLIENT 0)
set (LWS_WITHOUT_SERVER 0)
jwe
2018-12-13 20:05:12 +08:00
set (LWS_WITH_JOSE 1)
JOSE: refactor and prepare for JWE Until now the JOSE pieces only had enough support for ACME. This patch improves the JWK parsing to prepare for more complete support and for adding JWE, genaes and genec in later patches.
2018-11-27 08:36:08 +08:00
endif()
jwe
2018-12-13 20:05:12 +08:00
if (LWS_WITH_JOSE)
JWK + JWS: JSON Web Keys RFC7517 + Signatures support RFC7515 This adds some optional apis around JSON Web Keys and JSON Web Signatures. HMAC SHA256/384/512 and RSA + SHA256/384/512 are supported. This also add a new "LWS_WITH_SELFTESTS" that enables the selftests.
2017-10-18 19:27:38 +08:00
set(LWS_WITH_LEJP 1)
jwe
2018-12-13 20:05:12 +08:00
set(LWS_WITH_GENCRYPTO 1)
JWK + JWS: JSON Web Keys RFC7517 + Signatures support RFC7515 This adds some optional apis around JSON Web Keys and JSON Web Signatures. HMAC SHA256/384/512 and RSA + SHA256/384/512 are supported. This also add a new "LWS_WITH_SELFTESTS" that enables the selftests.
2017-10-18 19:27:38 +08:00
endif()
lwsws conf and plugins convert to libuv apis After discussion here https://libwebsockets.org/pipermail/libwebsockets/2016-April/002268.html scandir usage in - lwsws conf.c - lws plugin support and - lws plugin apis for dl are converted to us libuv apis so they can work cross-platform easily. lws itself remains not requiring libuv, although it's an option. - LWS_WITH_LWSWS - LWS_WITH_PLUGINS now force LWS_WITH_LIBUV if selected... both of these are new features only in master atm and both are off by default in CMake. There's a complication libuv can be too old to offer the necessary apis, this is the case in Travis Trusty instance. In that case, UV_VERSION_MAJOR ==0, then the unix-only plugin implementation is used instead. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-09 07:22:40 +08:00
if (LWS_WITH_PLUGINS AND NOT LWS_WITH_LIBUV)
message(STATUS "LWS_WITH_PLUGINS --> Enabling LWS_WITH_LIBUV")
set(LWS_WITH_LIBUV 1)
endif()
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
if (LWS_WITH_PLUGINS OR LWS_WITH_CGI)
# sshd plugin
jwe
2018-12-13 20:05:12 +08:00
set(LWS_WITH_GENCRYPTO 1)
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
endif()
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
if (LWS_WITH_GENERIC_SESSIONS)
set(LWS_WITH_SQLITE3 1)
set(LWS_WITH_SMTP 1)
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
set(LWS_WITH_STRUCT_SQLITE3 1)
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
endif()
ESP32 platform This is enough for all the test app features to work on ESP32 without SSL.
2017-02-18 17:26:40 +08:00
if (LWS_WITH_ESP32)
set(LWS_WITH_SHARED OFF)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_MBEDTLS ON)
esp32: separate factory setup
2017-03-16 10:46:31 +08:00
# set(LWS_WITHOUT_CLIENT ON)
ESP32 platform This is enough for all the test app features to work on ESP32 without SSL.
2017-02-18 17:26:40 +08:00
set(LWS_WITHOUT_TESTAPPS ON)
set(LWS_WITHOUT_EXTENSIONS ON)
set(LWS_WITH_PLUGINS OFF)
set(LWS_WITH_RANGES ON)
# this implies no pthreads in the lib
set(LWS_MAX_SMP 1)
set(LWS_HAVE_MALLOC 1)
set(LWS_HAVE_REALLOC 1)
set(LWS_HAVE_GETIFADDRS 1)
esp32: separate factory setup
2017-03-16 10:46:31 +08:00
set(LWS_WITH_ZIP_FOPS 1)
ah: custom headers for h1 Until now lws only parses headers it knows at build-time from its prebuilt lexical analyzer. This adds an on-by-default cmake option and a couple of apis to also store and query "custom", ie, unknown-to-lws headers. A minimal example is also provided. At the moment it only works on h1, h2 support needs improvements to the hpack implementation. Since it bloats ah memory usage compared to without it if custom headers are present, the related code and ah footprint can be disabled with the cmake option LWS_WITH_CUSTOM_HEADERS, but it's on by default normally. ESP32 platform disables it. https://github.com/warmcat/libwebsockets/pull/1499
2019-02-26 17:18:24 +08:00
set(LWS_WITH_CUSTOM_HEADERS 0)
ESP32 platform This is enough for all the test app features to work on ESP32 without SSL.
2017-02-18 17:26:40 +08:00
endif()
esp8266 initial support
2016-07-23 14:18:25 +08:00
multithread stability Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-26 20:56:56 +08:00
if (WIN32)
set(LWS_MAX_SMP 1)
threadpool
2018-09-02 14:35:37 +08:00
set(LWS_WITH_THREADPOOL 0)
multithread stability Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-26 20:56:56 +08:00
endif()
lwsws Libwebsockets Web Server This makes a start on the LibWebSockets WebServer. The app cmake build support and JSON config parsing are implemented and the app can start, create the vhosts, listen and serve file:// mounts on them. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 10:12:37 +08:00
if (LWS_WITHOUT_SERVER)
set(LWS_WITH_LWSWS OFF)
endif()
lws_dir: wrap dir scanning backend and convert lejp-conf We use POSIX dir scanning apis normally, but for windows, we require libuv to do it for us. Formalize that into a wrapper lws_dir() that hides the backend code. Make it configurable, ON by default and forced on with lejp-conf that depends on it.
2019-03-14 08:24:40 +08:00
if (LWS_WITH_LEJP_CONF)
set(LWS_WITH_DIR 1)
endif()
refactor: most preparation for -DLWS_ROLE_H1=0
2018-04-27 19:16:50 +08:00
# confirm H1 relationships
if (NOT LWS_ROLE_H1 AND LWS_ROLE_H2)
message(FATAL_ERROR "H2 requires LWS_ROLE_H1")
endif()
if (NOT LWS_ROLE_H1 AND LWS_ROLE_WS)
message(FATAL_ERROR "WS requires LWS_ROLE_H1")
endif()
if (NOT LWS_ROLE_H1 AND LWS_ROLE_CGI)
message(FATAL_ERROR "CGI requires LWS_ROLE_H1")
endif()
# confirm HTTP relationships
if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_HTTP_PROXY)
message(FATAL_ERROR "LWS_WITH_LWSWS requires LWS_ROLE_H1")
endif()
if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_HTTP_PROXY)
message(FATAL_ERROR "LWS_WITH_HTTP_PROXY requires LWS_ROLE_H1")
endif()
if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_RANGES)
message(FATAL_ERROR "LWS_WITH_RANGES requires LWS_ROLE_H1")
endif()
if (NOT LWS_ROLE_H1 AND NOT LWS_ROLE_H2 AND LWS_WITH_ACCESS_LOG)
message(FATAL_ERROR "LWS_WITH_ACCESS_LOG requires LWS_ROLE_H1")
endif()
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
if (LWS_WITH_HTTP_PROXY AND (LWS_WITHOUT_CLIENT OR LWS_WITHOUT_SERVER))
http proxy: client: unix socket support This allows the client stuff to understand that addresses beginning with '+' represent unix sockets. If the first character after the '+' is '@', it understands that the '@' should be read as '\0', in order to use Linux "abstract namespace" sockets. Further the lws_parse_uri() helper is extended to understand the convention that an address starting with + is a unix socket, and treats the socket path as delimited by ':', eg http://+/var/run/mysocket:/my/path HTTP Proxy is updated to allow mounts to these unix socket paths. Proxy connections go out on h1, but are dynamically translated to h1 or h2 on the incoming side. Proxy usage of libhubbub is separated out... LWS_WITH_HTTP_PROXY is on by default, and LWS_WITH_HUBBUB is off by default.
2018-09-04 08:06:46 +08:00
message("You have to enable both client and server for http proxy")
set(LWS_WITH_HTTP_PROXY 0)
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
# 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")
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
# Allow the user to use the old CyaSSL options/library in stead of wolfSSL
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_CYASSL AND LWS_WITH_WOLFSSL)
message(FATAL_ERROR "LWS_WITH_CYASSL and LWS_WITH_WOLFSSL are mutually exclusive!")
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_CYASSL)
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
# Copy CyaSSL options to the wolfSSL options
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_WOLFSSL ${LWS_WITH_CYASSL} CACHE BOOL "Use wolfSSL/CyaSSL instead of OpenSSL" FORCE)
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
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()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if (NOT (LWS_WITH_STATIC OR LWS_WITH_SHARED))
Fix some typographical and grammatical errors
2015-10-01 12:25:05 +03:00
message(FATAL_ERROR "Makes no sense to compile with neither static nor shared libraries.")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
if (NOT LWS_WITHOUT_EXTENSIONS OR LWS_WITH_ZIP_FOPS)
set(LWS_WITH_ZLIB 1)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
cmake: miniz: add as option
2019-07-03 19:46:23 +01:00
# if you gave LWS_WITH_MINIZ, point to MINIZ here if not found
# automatically
set(LWS_ZLIB_LIBRARIES CACHE PATH "Path to the zlib/miniz library")
set(LWS_ZLIB_INCLUDE_DIRS CACHE PATH "Path to the zlib/miniz include directory")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(LWS_OPENSSL_LIBRARIES CACHE PATH "Path to the OpenSSL library")
set(LWS_OPENSSL_INCLUDE_DIRS CACHE PATH "Path to the OpenSSL include directory")
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
set(LWS_WOLFSSL_LIBRARIES CACHE PATH "Path to the wolfSSL library")
set(LWS_WOLFSSL_INCLUDE_DIRS CACHE PATH "Path to the wolfSSL include directory")
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
set(LWS_LIBEV_LIBRARIES CACHE PATH "Path to the libev library")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(LWS_LIBEV_INCLUDE_DIRS CACHE PATH "Path to the libev include directory")
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
set(LWS_LIBUV_LIBRARIES CACHE PATH "Path to the libuv library")
cmake libuv fix include forcing path Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-31 08:33:47 +08:00
set(LWS_LIBUV_INCLUDE_DIRS CACHE PATH "Path to the libuv include directory")
Fix typo
2017-02-18 15:51:34 +08:00
set(LWS_SQLITE3_LIBRARIES CACHE PATH "Path to the sqlite3 library")
set(LWS_SQLITE3_INCLUDE_DIRS CACHE PATH "Path to the sqlite3 include directory")
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
set(LWS_LIBEVENT_INCLUDE_DIRS CACHE PATH "Path to the libevent include directory")
set(LWS_LIBEVENT_LIBRARIES CACHE PATH "Path to the libevent library")
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
cmake force internal SHA1 if no ssl https://github.com/warmcat/libwebsockets/issues/342 You have to explicitly disable LWS_WITHOUT_BUILTIN_SHA1 Cmake option alomg with SSL to disable SSL cmake .. -DLWS_WITH_SSL=OFF -DLWS_WITHOUT_BUILTIN_SHA1=OFF This makes that implicit with disabling SSL. Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-09 04:24:46 +08:00
if (NOT LWS_WITH_SSL)
set(LWS_WITHOUT_BUILTIN_SHA1 OFF)
endif()
boringssl: update
2018-11-23 10:52:39 +08:00
if (LWS_WITH_BORINGSSL)
# boringssl deprecated EVP_PKEY
set (LWS_WITH_GENHASH OFF)
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL AND NOT LWS_WITH_MBEDTLS)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
else()
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
if (NOT LWS_WITH_ESP32)
set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(OPENSSL_INCLUDE_DIRS ${LWS_OPENSSL_INCLUDE_DIRS})
set(OPENSSL_FOUND 1)
endif()
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_SSL AND LWS_WITH_WOLFSSL)
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
if ("${LWS_WOLFSSL_LIBRARIES}" STREQUAL "" OR "${LWS_WOLFSSL_INCLUDE_DIRS}" STREQUAL "")
if (NOT WOLFSSL_FOUND)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_CYASSL)
message(FATAL_ERROR "You must set LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS when LWS_WITH_CYASSL is turned on.")
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
else()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
message(FATAL_ERROR "You must set LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS when LWS_WITH_WOLFSSL is turned on.")
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
else()
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
set(WOLFSSL_LIBRARIES ${LWS_WOLFSSL_LIBRARIES})
set(WOLFSSL_INCLUDE_DIRS ${LWS_WOLFSSL_INCLUDE_DIRS})
set(WOLFSSL_FOUND 1)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
set(USE_WOLFSSL 1)
wolfSSL updates
2018-04-28 07:54:09 +08:00
set(LWS_WITH_TLS 1)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_CYASSL)
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
set(USE_OLD_CYASSL 1)
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_SSL AND LWS_WITH_MBEDTLS)
esp32: fixes for mbedtls breakout
2017-08-28 21:27:55 +08:00
if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "" AND NOT LWS_WITH_ESP32)
mbedtls: isgnore ECDH_H existence and try to find mbedtls libs + includes by default
2017-08-28 21:00:11 +08:00
find_path(LWS_MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h)
find_library(MBEDTLS_LIBRARY mbedtls)
find_library(MBEDX509_LIBRARY mbedx509)
find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
set(LWS_MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MBEDTLS DEFAULT_MSG
LWS_MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
mark_as_advanced(LWS_MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "")
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
message(FATAL_ERROR "You must set LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS when LWS_WITH_MBEDTLS is turned on.")
mbedtls: Add mbedTLS support to CMakeLists.txt
2017-08-28 20:12:32 +08:00
endif()
mbedtls: isgnore ECDH_H existence and try to find mbedtls libs + includes by default
2017-08-28 21:00:11 +08:00
endif()
esp32: fixes for mbedtls breakout
2017-08-28 21:27:55 +08:00
set(MBEDTLS_LIBRARIES ${LWS_MBEDTLS_LIBRARIES})
set(MBEDTLS_INCLUDE_DIRS ${LWS_MBEDTLS_INCLUDE_DIRS})
set(MBEDTLS_FOUND 1)
mbedtls: Add mbedTLS support to CMakeLists.txt
2017-08-28 20:12:32 +08:00
set(USE_MBEDTLS 1)
endif()
http: compression methods Add generic http compression layer eanbled at cmake with LWS_WITH_HTTP_STREAM_COMPRESSION. This is wholly a feature of the HTTP role (used by h1 and h2 roles) and doesn't exist outside that context. Currently provides 'deflate' and 'br' compression methods for server side only. 'br' requires also -DLWS_WITH_HTTP_BROTLI=1 at cmake and the brotli libraries (available in your distro already) and dev package. Other compression methods can be added nicely using an ops struct. The built-in file serving stuff will use this is the client says he can handle it, and the mimetype of the file either starts with "text/" (html and css etc) or is the mimetype of Javascript. zlib allocates quite a bit while in use, it seems to be around 256KiB per stream. So this is only useful on relatively strong servers with lots of memory. However for some usecases where you are serving a lot of css and js assets, it's a nice help. The patch performs special treatment for http/1.1 pipelining, since the compression is performed on the fly the compressed content-length is not known until the end. So for h1 only, chunked transfer-encoding is automatically added so pipelining can continue of the connection. For h2 the chunking is neither supported nor required, so it "just works". User code can also request to add a compression transform before the reply headers were sent using the new api LWS_VISIBLE int lws_http_compression_apply(struct lws *wsi, const char *name, unsigned char **p, unsigned char *end, char decomp); ... this allows transparent compression of dynamically generated HTTP. The requested compression (eg, "deflate") is only applied if the client headers indicated it was supported, otherwise it's a NOP. Name may be NULL in which case the first compression method in the internal table at stream.c that is mentioned as acceptable by the client will be used. NOTE: the compression translation, same as h2 support, relies on the user code using LWS_WRITE_HTTP and then LWS_WRITE_HTTP_FINAL on the last part written. The internal lws fileserving code already does this.
2018-09-02 14:43:05 +08:00
if (LWS_WITH_HTTP_STREAM_COMPRESSION)
set(LWS_WITH_ZLIB 1)
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_ZLIB AND NOT LWS_WITH_BUNDLED_ZLIB)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
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_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()
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
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)
endif()
endif()
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
if (LWS_WITH_LIBEVENT)
if ("${LWS_LIBEVENT_LIBRARIES}" STREQUAL "" OR "${LWS_LIBEVENT_INCLUDE_DIRS}" STREQUAL "")
else()
set(LIBEVENT_LIBRARIES ${LWS_LIBEVENT_LIBRARIES})
set(LIBEVENT_INCLUDE_DIRS ${LWS_LIBEVENT_INCLUDE_DIRS})
set(LIBEVENT_FOUND 1)
endif()
endif()
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
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()
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
libev: libevent conflicts at buildtime
2018-02-19 10:39:01 +08:00
if (LWS_WITH_LIBEV AND LWS_WITH_LIBEVENT)
message(FATAL_ERROR "Sorry libev and libevent conflict with each others' namespace, you can only have one or the other")
endif()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
# The base dir where the test-apps look for the SSL certs.
cmake and other fixes
2014-02-15 13:48:56 +08:00
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")
Turn off IPv6 in windows for now It's horribly broken AG: issue seems to be size of the addr struct as suggested on the list
2014-04-24 14:47:10 +02:00
Subject: Support to IPv6 on Windows
2017-05-30 18:31:06 -03:00
if (LWS_UNIX_SOCK)
Add unix domain socket
2016-03-30 22:47:02 -07:00
set(LWS_UNIX_SOCK OFF)
Subject: Support to IPv6 on Windows
2017-05-30 18:31:06 -03:00
message(WARNING "Windows does not support UNIX domain sockets")
Add unix domain socket
2016-03-30 22:47:02 -07:00
endif()
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
else()
cmake and other fixes
2014-02-15 13:48:56 +08:00
set(LWS_OPENSSL_CLIENT_CERTS /etc/pki/tls/certs/ CACHE PATH "Client SSL certificate directory")
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
endif()
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
# LWS_OPENSSL_SUPPORT deprecated... use LWS_WITH_TLS
if (LWS_WITH_SSL OR LWS_WITH_MBEDTLS)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
set(LWS_OPENSSL_SUPPORT 1)
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
set(LWS_WITH_TLS 1)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
endif()
ssl client use OS CA root certs by default Signed-off-by: Andy Green <andy.green@linaro.org>
2014-03-15 10:39:29 +08:00
if (LWS_SSL_CLIENT_USE_OS_CA_CERTS)
set(LWS_SSL_CLIENT_USE_OS_CA_CERTS 1)
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_WITH_LATENCY)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
set(LWS_LATENCY 1)
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_WITHOUT_DAEMONIZE OR WIN32)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
set(LWS_NO_DAEMONIZE 1)
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_WITHOUT_SERVER)
Added some minor changes to CMake build file. - Added options for compiling without server/client parts. - Fixed a syntax error on printing an error on CyaSSL compilation. - Don't compile server-extpoll either when the server isn't compiled.
2013-02-06 15:29:59 +09:00
set(LWS_NO_SERVER 1)
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_WITHOUT_CLIENT)
Added some minor changes to CMake build file. - Added options for compiling without server/client parts. - Fixed a syntax error on printing an error on CyaSSL compilation. - Don't compile server-extpoll either when the server isn't compiled.
2013-02-06 15:29:59 +09:00
set(LWS_NO_CLIENT 1)
endif()
libev port merged by andy@warmcat.com via https://github.com/gaby64/libwebsockets-libev To use, you need to both - cmake ---> -DLWS_USE_LIBEV=1 - info->options must have LWS_SERVER_OPTION_LIBEV set when creating the context this is so a single library can be built for distros to support apps that use normal polling and apps that use libev polling.
2014-03-23 13:25:07 +08:00
if (LWS_WITH_LIBEV)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_LIBEV 1)
libev port merged by andy@warmcat.com via https://github.com/gaby64/libwebsockets-libev To use, you need to both - cmake ---> -DLWS_USE_LIBEV=1 - info->options must have LWS_SERVER_OPTION_LIBEV set when creating the context this is so a single library can be built for distros to support apps that use normal polling and apps that use libev polling.
2014-03-23 13:25:07 +08:00
endif()
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
if (LWS_WITH_LIBUV)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_LIBUV 1)
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
endif()
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
if (LWS_WITH_LIBEVENT)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_LIBEVENT 1)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
endif()
ipv6 integration fixes Disable for build using -DLWS_IPV6= on the cmake line
2014-03-24 16:09:25 +08:00
if (LWS_IPV6)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_IPV6 1)
add ipv6 support (changed to support runtime disable + integration by andy@warmcat.com)
2014-03-24 16:09:25 +08:00
endif()
Add unix domain socket
2016-03-30 22:47:02 -07:00
if (LWS_UNIX_SOCK)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_UNIX_SOCK 1)
Add unix domain socket
2016-03-30 22:47:02 -07:00
endif()
http2 add initial alpn support Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-03 14:33:48 +08:00
if (LWS_WITH_HTTP2)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
set(LWS_WITH_HTTP2 1)
http2 add initial alpn support Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-03 14:33:48 +08:00
endif()
multithreaded service This adds support for multithreaded service to lws without adding any threading or locking code in the library. At context creation time you can request split the service part of the context into n service domains, which are load-balanced so that the most idle one gets the next listen socket accept. There's a single listen socket on one port still. User code may then spawn n threads doing n service loops / poll()s simultaneously. Locking is only required (I think) in the existing FD lock callbacks already handled by the pthreads server example, and that locking takes place in user code. So the library remains completely agnostic about the threading / locking scheme. And by default, it's completely compatible with one service thread so no changes are required by people uninterested in multithreaded service. However for people interested in extremely lightweight mass http[s]/ ws[s] service with minimum provisioning, the library can now do everything out of the box. To test it, just try $ libwebsockets-test-server-pthreads -j 8 where -j controls the number of service threads Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-19 03:34:24 +08:00
if ("${LWS_MAX_SMP}" STREQUAL "")
HTTP_PROXY: make usable
2017-06-12 13:36:24 +08:00
set(LWS_MAX_SMP 1)
multithreaded service This adds support for multithreaded service to lws without adding any threading or locking code in the library. At context creation time you can request split the service part of the context into n service domains, which are load-balanced so that the most idle one gets the next listen socket accept. There's a single listen socket on one port still. User code may then spawn n threads doing n service loops / poll()s simultaneously. Locking is only required (I think) in the existing FD lock callbacks already handled by the pthreads server example, and that locking takes place in user code. So the library remains completely agnostic about the threading / locking scheme. And by default, it's completely compatible with one service thread so no changes are required by people uninterested in multithreaded service. However for people interested in extremely lightweight mass http[s]/ ws[s] service with minimum provisioning, the library can now do everything out of the box. To test it, just try $ libwebsockets-test-server-pthreads -j 8 where -j controls the number of service threads Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-19 03:34:24 +08:00
endif()
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
# using any abstract protocol enables LWS_WITH_ABSTRACT
if (LWS_WITH_SMTP)
set(LWS_WITH_ABSTRACT 1)
endif()
ssl split out common server and client ssl sources Most of ssl.c is under a #ifdef for client or server disabled... let's get rid of it and have CMake just build the appropriate files Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-29 08:51:42 +08:00
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
if (MINGW)
set(LWS_MINGW_SUPPORT 1)
Implemented fixes allowing libwebsockets to be built under Windows using MinGM/MSYS Improvemed patches to address travis and appveyor build errors Reduced WINVER and _WIN32_WINNT to 0x0501 to be less restrictive Refined CMakeLists.txt to allow for normal Windows and MinGW-specific OpenSSL certificate generation Simplified include path to gettimeofday.h Removed unnecessary list(APPEND LWS_LIBRARIES zlib_internal) export Added back #include <windows.h> to gettimeofday.c to fix build for normal Windows Made sure that pollfd gets defined on libwebsockets side when _WIN32_WINNT < 0x0600 Made sure that WINVER and _WIN32_WINNT don't get overridden by libwebsockets headers when already set to something greater than 0x0501 Added missing declaration of WSAPoll function for WINVER < 0x0600 in libwebsockets.h, eliminated invalid usages of pollfd instead of libwebsocket_pollfd in test-server.c Cleaned up duplicate content in gettimeofday.c, removed header inclusions from gettimeofday.h and fixed include order in test-echo.c, test-ping.c and test-server.c to enable build with normal Windows and MinGW Re-enabled debug_level in test-echo.c and made sure that the call to lws_set_log_level() is also active under Windows (just like in test-server.c); replaced all WIN32 occurrences by _WIN32 in test-echo.c, test-ping.c, and test-server.c Removed build-msys.sh and added new section about how to build libwebsockets using MinGW to README.build.md
2015-10-23 08:10:55 +02:00
set(CMAKE_C_FLAGS "-D__USE_MINGW_ANSI_STDIO ${CMAKE_C_FLAGS}")
mingw: fixes
2017-12-01 11:36:31 +08:00
add_definitions(-DWINVER=0x0601 -D_WIN32_WINNT=0x0601)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
endif()
ssl add ECDH server support (AG clean style add option flag and docs)
2016-01-15 16:21:51 +08:00
if (LWS_SSL_SERVER_WITH_ECDH_CERT)
set(LWS_SSL_SERVER_WITH_ECDH_CERT 1)
endif()
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
include_directories("${PROJECT_BINARY_DIR}")
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
Added check for inline keyword availability. Both to CMake project and Autoconf. inline will be defined to whatever inline replacement exists on the system, such as __inline or __inline__
2013-02-06 15:28:07 +09:00
include(CheckCSourceCompiles)
# Check for different inline keyword versions.
foreach(KEYWORD "inline" "__inline__" "__inline")
set(CMAKE_REQUIRED_DEFINITIONS "-DKEYWORD=${KEYWORD}")
CHECK_C_SOURCE_COMPILES(
"
#include <stdio.h>
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
static KEYWORD void a() {}
Added check for inline keyword availability. Both to CMake project and Autoconf. inline will be defined to whatever inline replacement exists on the system, such as __inline or __inline__
2013-02-06 15:28:07 +09:00
int main(int argc, char **argv) { a(); return 0; }
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
" LWS_HAVE_${KEYWORD})
Added check for inline keyword availability. Both to CMake project and Autoconf. inline will be defined to whatever inline replacement exists on the system, such as __inline or __inline__
2013-02-06 15:28:07 +09:00
endforeach()
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
if (NOT LWS_HAVE_inline)
if (LWS_HAVE___inline__)
Added check for inline keyword availability. Both to CMake project and Autoconf. inline will be defined to whatever inline replacement exists on the system, such as __inline or __inline__
2013-02-06 15:28:07 +09:00
set(inline __inline__)
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
elseif(LWS_HAVE___inline)
Added check for inline keyword availability. Both to CMake project and Autoconf. inline will be defined to whatever inline replacement exists on the system, such as __inline or __inline__
2013-02-06 15:28:07 +09:00
set(inline __inline)
endif()
endif()
Subject: Fix some typographical and grammatical errors.
2016-10-02 02:21:03 +03:00
# Put the libraries and binaries that get built into directories at the
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
# top of the build tree rather than in hard-to-find leaf directories.
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
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")
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
lejp-conf: substitute _lws_ddir_ with install dir
2016-07-06 10:48:41 +08:00
SET(LWS_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}")
trac 27: use fullpath in OSX dynamic libs Signed-off-by: thinkski <chiszp@gmail.com>
2013-04-16 19:48:05 +08:00
# Put absolute path of dynamic libraries into the object code. Some
# architectures, notably Mac OS X, need this.
cmake and other fixes
2014-02-15 13:48:56 +08:00
SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}")
trac 27: use fullpath in OSX dynamic libs Signed-off-by: thinkski <chiszp@gmail.com>
2013-04-16 19:48:05 +08:00
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
include(CheckFunctionExists)
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
include(CheckSymbolExists)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
include(CheckIncludeFile)
include(CheckIncludeFiles)
include(CheckLibraryExists)
Fix type checks in CMake Use CHECK_TYPE_SIZE to check existence of types.
2014-02-28 00:42:08 +01:00
include(CheckTypeSize)
pipe2 where possible
2018-04-12 21:37:59 +08:00
include(CheckCSourceCompiles)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
LWS_WITHOUT_BUILTIN_SHA1 Signed-off-by: Andy Green <andy.green@linaro.org>
2015-10-15 11:20:40 +08:00
if (LWS_WITHOUT_BUILTIN_SHA1)
set(LWS_SHA1_USE_OPENSSL_NAME 1)
endif()
Subject: Haiku: initial platform support https://github.com/warmcat/libwebsockets/pull/1033
2017-09-24 15:30:42 +00:00
if (HAIKU)
set(CMAKE_REQUIRED_LIBRARIES network)
endif()
glibc: if malloc_trim() exists, call it periodically
2019-03-16 08:10:47 +08:00
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)
bzero: improve detection of builtin
2018-10-09 15:14:12 +08:00
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
CHECK_FUNCTION_EXISTS(fork LWS_HAVE_FORK)
CHECK_FUNCTION_EXISTS(getenv LWS_HAVE_GETENV)
CHECK_FUNCTION_EXISTS(malloc LWS_HAVE_MALLOC)
CHECK_FUNCTION_EXISTS(memset LWS_HAVE_MEMSET)
CHECK_FUNCTION_EXISTS(realloc LWS_HAVE_REALLOC)
CHECK_FUNCTION_EXISTS(socket LWS_HAVE_SOCKET)
CHECK_FUNCTION_EXISTS(strerror LWS_HAVE_STRERROR)
CHECK_FUNCTION_EXISTS(vfork LWS_HAVE_VFORK)
cgi env Improve cgi support so it's capable of running cgit
2016-03-20 11:55:25 +08:00
CHECK_FUNCTION_EXISTS(execvpe LWS_HAVE_EXECVPE)
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
CHECK_FUNCTION_EXISTS(getifaddrs LWS_HAVE_GETIFADDRS)
windows deal with no snprintf Signed-off-by: Andy Green <andy.green@linaro.org>
2016-03-04 10:53:51 +08:00
CHECK_FUNCTION_EXISTS(snprintf LWS_HAVE_SNPRINTF)
CHECK_FUNCTION_EXISTS(_snprintf LWS_HAVE__SNPRINTF)
CHECK_FUNCTION_EXISTS(_vsnprintf LWS_HAVE__VSNPRINTF)
server status add getloadavg and lib version and more css Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-26 07:45:45 +08:00
CHECK_FUNCTION_EXISTS(getloadavg LWS_HAVE_GETLOADAVG)
win32: enable 64-bit file lengths https://github.com/warmcat/libwebsockets/issues/916 AG added more appveyor warning cleaning and stitched in cmake tests
2017-06-09 20:20:42 +08:00
CHECK_FUNCTION_EXISTS(atoll LWS_HAVE_ATOLL)
CHECK_FUNCTION_EXISTS(_atoi64 LWS_HAVE__ATOI64)
CHECK_FUNCTION_EXISTS(_stat32i64 LWS_HAVE__STAT32I64)
unify us sorted waits There are quite a few linked-lists of things that want events after some period. This introduces a type binding an lws_dll2 for the list and a lws_usec_t for the duration. The wsi timeouts, the hrtimer and the sequencer timeouts are converted to use these, also in the common event wait calculation.
2019-08-08 20:05:03 +01:00
CHECK_FUNCTION_EXISTS(clock_gettime LWS_HAVE_CLOCK_GETTIME)
unix plat: use eventfd in place of pipe where possible From eventfd man page: Applications can use an eventfd file descriptor instead of a pipe (see pipe(2)) in all cases where a pipe is used simply to signal events. The kernel overhead of an eventfd file descriptor is much lower than that of a pipe, and only one file descriptor is required (versus the two required for a pipe).
2020-02-09 05:22:19 +00:00
CHECK_FUNCTION_EXISTS(eventfd LWS_HAVE_EVENTFD)
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
if (NOT LWS_HAVE_GETIFADDRS)
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_WITHOUT_BUILTIN_GETIFADDRS)
message(FATAL_ERROR "No getifaddrs was found on the system. Turn off the LWS_WITHOUT_BUILTIN_GETIFADDRS compile option to use the supplied BSD version.")
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
endif()
set(LWS_BUILTIN_GETIFADDRS 1)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
endif()
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
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(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 for sys/sockio.h.
2016-09-09 06:48:24 +08:00
CHECK_INCLUDE_FILE(sys/sockio.h LWS_HAVE_SYS_SOCKIO_H)
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
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)
capabilities support
2017-06-07 06:10:02 +08:00
CHECK_INCLUDE_FILE(sys/capability.h LWS_HAVE_SYS_CAPABILITY_H)
mbedtls wrapper: check for malloc.h before using https://github.com/warmcat/libwebsockets/issues/1163
2018-01-26 07:22:35 +08:00
CHECK_INCLUDE_FILE(malloc.h LWS_HAVE_MALLOC_H)
pthreads: build test server based on pthreads.h availability ... and fix signed / unsigned comparison
2018-03-02 09:01:22 +08:00
CHECK_INCLUDE_FILE(pthread.h LWS_HAVE_PTHREAD_H)
solve compilation problems on vs2012
2019-07-31 16:31:22 +08:00
CHECK_INCLUDE_FILE(inttypes.h LWS_HAVE_INTTYPES_H)
capabilities support
2017-06-07 06:10:02 +08:00
role: dbus This adds support for the integrating libdbus into the lws event loop. Unlike the other roles, lws doesn't completely adopt the fd and libdbus insists to retain control over the fd lifecycle. However libdbus provides apis for foreign code (lws) to provide event loop services to libdbus for the fd. Accordingly, unlike the other roles rx and writeable are not subsumed into lws callback messages and the events remain the property of libdbus. A context struct wrapper is provided that is available in the libdbus callbacks to bridge between the lws and dbus worlds, along with a minimal example dbus client and server.
2018-10-02 10:50:24 +08:00
CHECK_LIBRARY_EXISTS(cap cap_set_flag "" LWS_HAVE_LIBCAP)
if (LWS_ROLE_DBUS)
if (NOT LWS_DBUS_LIB)
set(LWS_DBUS_LIB "dbus-1")
endif()
CHECK_LIBRARY_EXISTS(${LWS_DBUS_LIB} dbus_connection_set_watch_functions "" LWS_HAVE_LIBDBUS)
dbus-ws-proxy This builds on the new dbus role support to provide a minimal example proxy between ws and dbus. A client app is provided that asks the proxy to connect to libwebsockets.org and proxy the drawing data from the mirror example there back to the dbus client using dbus messages.
2018-10-03 14:14:29 +08:00
if (NOT LWS_HAVE_LIBDBUS)
message(FATAL_ERROR "Install dbus-devel, or libdbus-1-dev etc")
endif()
role: dbus This adds support for the integrating libdbus into the lws event loop. Unlike the other roles, lws doesn't completely adopt the fd and libdbus insists to retain control over the fd lifecycle. However libdbus provides apis for foreign code (lws) to provide event loop services to libdbus for the fd. Accordingly, unlike the other roles rx and writeable are not subsumed into lws callback messages and the events remain the property of libdbus. A context struct wrapper is provided that is available in the libdbus callbacks to bridge between the lws and dbus worlds, along with a minimal example dbus client and server.
2018-10-02 10:50:24 +08:00
if (NOT LWS_DBUS_INCLUDE1)
# look in fedora and debian / ubuntu place
if (EXISTS "/usr/include/dbus-1.0")
set(LWS_DBUS_INCLUDE1 "/usr/include/dbus-1.0")
else()
message(FATAL_ERROR "Set LWS_DBUS_INCLUDE1 to /usr/include/dbus-1.0 or wherever the main dbus includes are")
endif()
endif()
if (NOT LWS_DBUS_INCLUDE2)
# look in fedora... debian / ubuntu has the ARCH in the path...
if (EXISTS "/usr/lib64/dbus-1.0/include")
set(LWS_DBUS_INCLUDE2 "/usr/lib64/dbus-1.0/include")
else()
message(FATAL_ERROR "Set LWS_DBUS_INCLUDE2 to /usr/lib/ARCH-linux-gnu/dbus-1.0/include or wherever dbus-arch-deps.h is on your system")
endif()
endif()
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${LWS_DBUS_INCLUDE1};${LWS_DBUS_INCLUDE2})
CHECK_C_SOURCE_COMPILES("#include <dbus/dbus.h>
int main(void) {
return 0;
}" LWS_DBUS_CHECK_OK)
endif()
mbed3 build support Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-02 08:21:08 +08:00
ubuntu: fix uv detection for lwsws
2016-10-05 13:49:46 +08:00
if (LWS_WITH_LIBUV)
CHECK_INCLUDE_FILE(uv-version.h LWS_HAVE_UV_VERSION_H)
CMakeLists: add check for new libuv header
2018-06-24 03:27:44 +01:00
# libuv changed the location in 1.21.0. Retain both
# checks temporarily to ensure a smooth transition.
plugins: gitws libjsongit2 support This adds a plugin that interfaces to libjsongit2 https://warmcat.com/git/libjsongit2 to provide a per-vhost service for presenting bare git repos in a web interface.
2018-08-14 08:00:25 +08:00
if (NOT LWS_HAVE_UV_VERSION_H)
CMakeLists: add check for new libuv header
2018-06-24 03:27:44 +01:00
CHECK_INCLUDE_FILE(uv/version.h LWS_HAVE_NEW_UV_VERSION_H)
endif()
ubuntu: fix uv detection for lwsws
2016-10-05 13:49:46 +08:00
endif()
ev: log aio backend
2020-02-09 05:48:10 +00:00
if (LWS_WITH_LIBEV)
CHECK_C_SOURCE_COMPILES(
"#include <ev.h>
int main(int argc, char **argv) { return EVBACKEND_LINUXAIO; }
" LWS_HAVE_EVBACKEND_LINUXAIO)
endif()
ubuntu: fix uv detection for lwsws
2016-10-05 13:49:46 +08:00
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_ZLIB AND NOT LWS_WITH_BUNDLED_ZLIB)
cmake: miniz: add as option
2019-07-03 19:46:23 +01:00
if (LWS_WITH_MINIZ)
CHECK_INCLUDE_FILE(miniz.h LWS_HAVE_ZLIB_H)
else()
CHECK_INCLUDE_FILE(zlib.h LWS_HAVE_ZLIB_H)
endif()
mbed3 build support Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-02 08:21:08 +08:00
endif()
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
Fix some typographical and grammatical errors
2015-10-01 12:25:05 +03:00
# TODO: These can also be tested to see whether they actually work...
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
set(LWS_HAVE_WORKING_FORK LWS_HAVE_FORK)
set(LWS_HAVE_WORKING_VFORK LWS_HAVE_VFORK)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
CHECK_INCLUDE_FILES("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
lws_intptr_t
2017-07-07 08:32:04 +08:00
CHECK_C_SOURCE_COMPILES("#include <stdint.h>
int main(void) {
intptr_t test = 1;
return 0;
}" LWS_HAS_INTPTR_T)
openssl: detect apis correctly when pthreads not available Since version 3.1.0 and commit aa4143aebdb59f4f21094781fb3b6ab4649643a6, -pthread is unconditionally added to CMAKE_REQUIRED_FLAGS even if pthread.h is not found, this will result in a build failure with openssl if the toolchain doesn't support threads: [ 5%] Building C object CMakeFiles/websockets_shared.dir/lib/core/lws_dll2.c.o In file included from /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/include/libwebsockets.h:570, from /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/lib/core/private.h:130, from /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/lib/core/lws_dll2.c:22: /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/include/libwebsockets/lws-genhash.h:79:18: error: field 'ctx' has incomplete type HMAC_CTX ctx; ^~~ This build failure is raised because openssl functions are not correcly detected: Determining if the function SSL_CTX_set1_param exists failed with the following output: Change Dir: /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/CMakeFiles/CMakeTmp Run Build Command(s):/usr/bin/make cmTC_06946/fast && make[1]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/CMakeFiles/CMakeTmp' /usr/bin/make -f CMakeFiles/cmTC_06946.dir/build.make CMakeFiles/cmTC_06946.dir/build make[2]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/CMakeFiles/CMakeTmp' Building C object CMakeFiles/cmTC_06946.dir/CheckFunctionExists.c.o /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc --sysroot=/home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot -DKEYWORD=__inline -Wall -Wsign-compare -Wuninitialized -Werror -Wundef -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=SSL_CTX_set1_param -pthread -DNDEBUG -o CMakeFiles/cmTC_06946.dir/CheckFunctionExists.c.o -c /home/buildroot/autobuild/instance-2/output-1/host/share/cmake-3.15/Modules/CheckFunctionExists.c Linking C executable cmTC_06946 /home/buildroot/autobuild/instance-2/output-1/host/bin/cmake -E cmake_link_script CMakeFiles/cmTC_06946.dir/link.txt --verbose=1 /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc --sysroot=/home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot -Wall -Wsign-compare -Wuninitialized -Werror -Wundef -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=SSL_CTX_set1_param -pthread -DNDEBUG CMakeFiles/cmTC_06946.dir/CheckFunctionExists.c.o -o cmTC_06946 /home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libssl.so /home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libcrypto.so -lssl -lcrypto -lm -lcap /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread collect2: error: ld returned 1 exit status CMakeFiles/cmTC_06946.dir/build.make:88: recipe for target 'cmTC_06946' failed Fixes: - http://autobuild.buildroot.org/results/6186b4718db285edadf7203d00ed72f8d76a31e4 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-01-01 10:48:04 +00:00
if (LWS_HAVE_PTHREAD_H)
cmake: old osx clang: suppress check failures sue to -pthread only recognized at compile time
2020-01-27 16:23:39 +00:00
if ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
set(CMAKE_REQUIRED_FLAGS "-pthread -Wno-error=unused-command-line-argument")
else()
set(CMAKE_REQUIRED_FLAGS "-pthread")
endif()
openssl: detect apis correctly when pthreads not available Since version 3.1.0 and commit aa4143aebdb59f4f21094781fb3b6ab4649643a6, -pthread is unconditionally added to CMAKE_REQUIRED_FLAGS even if pthread.h is not found, this will result in a build failure with openssl if the toolchain doesn't support threads: [ 5%] Building C object CMakeFiles/websockets_shared.dir/lib/core/lws_dll2.c.o In file included from /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/include/libwebsockets.h:570, from /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/lib/core/private.h:130, from /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/lib/core/lws_dll2.c:22: /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/include/libwebsockets/lws-genhash.h:79:18: error: field 'ctx' has incomplete type HMAC_CTX ctx; ^~~ This build failure is raised because openssl functions are not correcly detected: Determining if the function SSL_CTX_set1_param exists failed with the following output: Change Dir: /home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/CMakeFiles/CMakeTmp Run Build Command(s):/usr/bin/make cmTC_06946/fast && make[1]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/CMakeFiles/CMakeTmp' /usr/bin/make -f CMakeFiles/cmTC_06946.dir/build.make CMakeFiles/cmTC_06946.dir/build make[2]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/libwebsockets-3.2.0/CMakeFiles/CMakeTmp' Building C object CMakeFiles/cmTC_06946.dir/CheckFunctionExists.c.o /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc --sysroot=/home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot -DKEYWORD=__inline -Wall -Wsign-compare -Wuninitialized -Werror -Wundef -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=SSL_CTX_set1_param -pthread -DNDEBUG -o CMakeFiles/cmTC_06946.dir/CheckFunctionExists.c.o -c /home/buildroot/autobuild/instance-2/output-1/host/share/cmake-3.15/Modules/CheckFunctionExists.c Linking C executable cmTC_06946 /home/buildroot/autobuild/instance-2/output-1/host/bin/cmake -E cmake_link_script CMakeFiles/cmTC_06946.dir/link.txt --verbose=1 /home/buildroot/autobuild/instance-2/output-1/host/bin/arm-linux-gcc --sysroot=/home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot -Wall -Wsign-compare -Wuninitialized -Werror -Wundef -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=SSL_CTX_set1_param -pthread -DNDEBUG CMakeFiles/cmTC_06946.dir/CheckFunctionExists.c.o -o cmTC_06946 /home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libssl.so /home/buildroot/autobuild/instance-2/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libcrypto.so -lssl -lcrypto -lm -lcap /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread collect2: error: ld returned 1 exit status CMakeFiles/cmTC_06946.dir/build.make:88: recipe for target 'cmTC_06946' failed Fixes: - http://autobuild.buildroot.org/results/6186b4718db285edadf7203d00ed72f8d76a31e4 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-01-01 10:48:04 +00:00
CHECK_C_SOURCE_COMPILES("#define _GNU_SOURCE
#include <pthread.h>
int main(void) {
pthread_t th = 0;
pthread_setname_np(th, NULL);
return 0;
}" LWS_HAS_PTHREAD_SETNAME_NP)
endif()
qnx: qnx6.5 compatibility
2019-01-11 16:48:53 +08:00
CMakeLists.txt: fix LWS_HAS_GETOPT_LONG Commit 6985244eb128ea681bb04566d88465c42161b2ce wrongly moved LWS_HAS_GETOPT_LONG under LWS_HAVE_PTHREAD_H so revert this change Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-01-03 14:26:18 +01:00
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)
qnx: qnx6.5 compatibility
2019-01-11 16:48:53 +08:00
Fix type checks in CMake Use CHECK_TYPE_SIZE to check existence of types.
2014-02-28 00:42:08 +01:00
if (NOT PID_T_SIZE)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(pid_t int)
Fix type checks in CMake Use CHECK_TYPE_SIZE to check existence of types.
2014-02-28 00:42:08 +01:00
endif()
if (NOT SIZE_T_SIZE)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(size_t "unsigned int")
endif()
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
if (NOT LWS_HAVE_MALLOC)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(malloc rpl_malloc)
endif()
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
if (NOT LWS_HAVE_REALLOC)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(realloc rpl_realloc)
endif()
Subject: Build on SmartOS
2019-08-11 23:57:27 +00:00
if (UNIX)
execute_process(COMMAND uname -n OUTPUT_VARIABLE NODENAME)
# Need to chomp the \n at end of output.
string(REGEX REPLACE "[\n]+" "" NODENAME "${NODENAME}")
if( NODENAME STREQUAL "smartos" )
add_definitions( "-D__smartos__" )
set(SMARTOS 1)
endif()
endif()
Separate private defines in lws_config_private.h So we don't expose all HAVE_ macros and such to the world.
2015-06-26 11:40:54 +02:00
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
if (MSVC)
# Turn off stupid microsoft security warnings.
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
cmake some cosmetic improvementss Signed-off-by: Edwin van den Oetelaar <oetelaar.automatisering@gmail.com>
2013-03-10 06:53:57 +08:00
endif(MSVC)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
include_directories("${PROJECT_SOURCE_DIR}/lib")
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
# Group headers and sources.
# Some IDEs use this for nicer file structure.
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(HDR_PRIVATE
refactor: core code in lib/core and private-libwebsockets.h to core/private.h This commit is coverity-clean as tested cmake .. -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_WITHOUT_EXTENSIONS=1 -DLWS_WITH_ACME=1 -DLWS_WITH_LWSWS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_HTTP2=1 -DLWS_WITHOUT_CLIENT=0 -DLWS_WITHOUT_SERVER=0 -DLWS_UNIX_SOCK=1 -DLWS_WITH_TLS=0 -DLWS_WITH_MBEDTLS=0 -DLWS_WITH_CGI=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_GENERIC_SESSIONS=1 -DLWS_WITH_RANGES=1 -DLWS_ROLE_WS=1 -DLWS_MAX_SMP=16 -DLWS_ROLE_H1=1 -DLWS_WITH_WOLFSSL=0 -DLWS_WITH_LIBEV=0 -DLWS_WITH_LIBEVENT=1
2018-05-03 10:49:36 +08:00
lib/core/private.h)
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(HDR_PUBLIC
libwebsockets.h: split out into a dir of sub-includes included by libwebsockets.h This has no effect on user code or backward compatibility. It moves the in-tree public api header libwebsockets.h from ./lib to ./include, and introduces a dir ./include/libwebsockets/ The single public api header is split out into 31 sub-headers in ./include/libwebsockets. ./include/libwebsockets.h contains some core types and platform adaptation code, but the rest of it is now 31 #include <libwebsockets/...> At install time, /usr/[local/]include/libwebsockets.h is installed as before, along now with the 31 sub-headers in ...include/libwebsockets/ There's no net effect on user code. But the api header is now much easier to maintain and study, with 31 topic-based sub headers.
2018-08-23 09:46:01 +08:00
"${PROJECT_SOURCE_DIR}/include/libwebsockets.h"
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
"${PROJECT_BINARY_DIR}/lws_config.h"
"${PROJECT_SOURCE_DIR}/plugins/ssh-base/include/lws-plugin-ssh.h"
)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
set(SOURCES
refactor: split out adoption and client apis to core - split raw role into separate skt and file - remove all special knowledge from the adoption apis and migrate to core - remove all special knowledge from client_connect stuff, and have it discovered by iterating the role callbacks to let those choose how to bind; migrate to core - retire the old deprecated client apis pre- client_connect_info
2018-05-10 16:13:26 +08:00
lib/core/alloc.c
lws_struct lws_struct JSON + sqlite3 serializer and deserializer See READMEs/README.lws_struct.md
2019-03-30 22:14:15 +08:00
lib/core/buflist.c
refactor: split out adoption and client apis to core - split raw role into separate skt and file - remove all special knowledge from the adoption apis and migrate to core - remove all special knowledge from client_connect stuff, and have it discovered by iterating the role callbacks to let those choose how to bind; migrate to core - retire the old deprecated client apis pre- client_connect_info
2018-05-10 16:13:26 +08:00
lib/core/context.c
lws_struct lws_struct JSON + sqlite3 serializer and deserializer See READMEs/README.lws_struct.md
2019-03-30 22:14:15 +08:00
lib/core/lws_dll2.c
refactor: core code in lib/core and private-libwebsockets.h to core/private.h This commit is coverity-clean as tested cmake .. -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_WITHOUT_EXTENSIONS=1 -DLWS_WITH_ACME=1 -DLWS_WITH_LWSWS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_HTTP2=1 -DLWS_WITHOUT_CLIENT=0 -DLWS_WITHOUT_SERVER=0 -DLWS_UNIX_SOCK=1 -DLWS_WITH_TLS=0 -DLWS_WITH_MBEDTLS=0 -DLWS_WITH_CGI=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_GENERIC_SESSIONS=1 -DLWS_WITH_RANGES=1 -DLWS_ROLE_WS=1 -DLWS_MAX_SMP=16 -DLWS_ROLE_H1=1 -DLWS_WITH_WOLFSSL=0 -DLWS_WITH_LIBEV=0 -DLWS_WITH_LIBEVENT=1
2018-05-03 10:49:36 +08:00
lib/core/libwebsockets.c
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
lib/core/logs.c
refactor: split out adoption and client apis to core - split raw role into separate skt and file - remove all special knowledge from the adoption apis and migrate to core - remove all special knowledge from client_connect stuff, and have it discovered by iterating the role callbacks to let those choose how to bind; migrate to core - retire the old deprecated client apis pre- client_connect_info
2018-05-10 16:13:26 +08:00
lib/misc/base64-decode.c
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
lib/core/vfs.c
refactor: split out adoption and client apis to core - split raw role into separate skt and file - remove all special knowledge from the adoption apis and migrate to core - remove all special knowledge from client_connect stuff, and have it discovered by iterating the role callbacks to let those choose how to bind; migrate to core - retire the old deprecated client apis pre- client_connect_info
2018-05-10 16:13:26 +08:00
lib/misc/lws-ring.c
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
)
lws_dll: upgrade all instances to lws_dll2 lws_dll2 removes the downsides of lws_dll and adds new features like a running member count and explicit owner type... it's cleaner and more robust (eg, nodes know their owner, so they can casually switch between list owners and remove themselves without the code knowing the owner). This deprecates lws_dll, but since it's public it allows it to continue to be built for 4.0 release if you give cmake LWS_WITH_DEPRECATED_LWS_DLL. All remaining internal users of lws_dll are migrated to lws_dll2.
2019-08-08 16:58:55 +01:00
if (LWS_WITH_DEPRECATED_LWS_DLL)
list(APPEND SOURCES
lib/core/lws_dll.c)
endif()
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_NETWORK)
list(APPEND SOURCES
lib/core-net/dummy-callback.c
lib/core-net/output.c
lib/core-net/close.c
lib/core-net/network.c
lib/core-net/vhost.c
lib/core-net/pollfd.c
lib/core-net/service.c
unify us sorted waits There are quite a few linked-lists of things that want events after some period. This introduces a type binding an lws_dll2 for the list and a lws_usec_t for the duration. The wsi timeouts, the hrtimer and the sequencer timeouts are converted to use these, also in the common event wait calculation.
2019-08-08 20:05:03 +01:00
lib/core-net/sorted-usec-list.c
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
lib/core-net/stats.c
lib/core-net/wsi.c
lib/core-net/wsi-timeout.c
lib/core-net/adopt.c
lib/roles/pipe/ops-pipe.c
)
seq: LWS_WITH_SEQUENCER default-on force off if NO_NETWORK (which is tested in travis)
2019-08-09 09:14:48 +01:00
lws_dsh
2019-08-11 06:47:19 +01:00
if (LWS_WITH_LWS_DSH)
list(APPEND SOURCES
lib/core-net/lws-dsh.c)
endif()
seq: LWS_WITH_SEQUENCER default-on force off if NO_NETWORK (which is tested in travis)
2019-08-09 09:14:48 +01:00
if (LWS_WITH_SEQUENCER)
list(APPEND SOURCES
lib/core-net/sequencer.c)
endif()
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
if (LWS_WITH_ABSTRACT)
list(APPEND SOURCES
unit test sequencer
2019-06-26 14:32:46 +01:00
lib/abstract/abstract.c
)
seq: LWS_WITH_SEQUENCER default-on force off if NO_NETWORK (which is tested in travis)
2019-08-09 09:14:48 +01:00
if (LWS_WITH_SEQUENCER)
list(APPEND SOURCES
lib/abstract/test-sequencer.c)
endif()
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
endif()
seq: LWS_WITH_SEQUENCER default-on force off if NO_NETWORK (which is tested in travis)
2019-08-09 09:14:48 +01:00
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_STATS)
list(APPEND SOURCES
lib/core-net/stats.c
)
endif()
endif()
lws_dir: wrap dir scanning backend and convert lejp-conf We use POSIX dir scanning apis normally, but for windows, we require libuv to do it for us. Formalize that into a wrapper lws_dir() that hides the backend code. Make it configurable, ON by default and forced on with lejp-conf that depends on it.
2019-03-14 08:24:40 +08:00
if (LWS_WITH_DIR)
list(APPEND SOURCES lib/misc/dir.c)
endif()
threadpool
2018-09-02 14:35:37 +08:00
if (LWS_WITH_THREADPOOL AND UNIX AND LWS_HAVE_PTHREAD_H)
list(APPEND SOURCES lib/misc/threadpool/threadpool.c)
endif()
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
refactor: most preparation for -DLWS_ROLE_H1=0
2018-04-27 19:16:50 +08:00
if (LWS_ROLE_H1 OR LWS_ROLE_H2)
list(APPEND SOURCES
lib/roles/http/header.c
lib/roles/http/server/parsers.c)
http: compression methods Add generic http compression layer eanbled at cmake with LWS_WITH_HTTP_STREAM_COMPRESSION. This is wholly a feature of the HTTP role (used by h1 and h2 roles) and doesn't exist outside that context. Currently provides 'deflate' and 'br' compression methods for server side only. 'br' requires also -DLWS_WITH_HTTP_BROTLI=1 at cmake and the brotli libraries (available in your distro already) and dev package. Other compression methods can be added nicely using an ops struct. The built-in file serving stuff will use this is the client says he can handle it, and the mimetype of the file either starts with "text/" (html and css etc) or is the mimetype of Javascript. zlib allocates quite a bit while in use, it seems to be around 256KiB per stream. So this is only useful on relatively strong servers with lots of memory. However for some usecases where you are serving a lot of css and js assets, it's a nice help. The patch performs special treatment for http/1.1 pipelining, since the compression is performed on the fly the compressed content-length is not known until the end. So for h1 only, chunked transfer-encoding is automatically added so pipelining can continue of the connection. For h2 the chunking is neither supported nor required, so it "just works". User code can also request to add a compression transform before the reply headers were sent using the new api LWS_VISIBLE int lws_http_compression_apply(struct lws *wsi, const char *name, unsigned char **p, unsigned char *end, char decomp); ... this allows transparent compression of dynamically generated HTTP. The requested compression (eg, "deflate") is only applied if the client headers indicated it was supported, otherwise it's a NOP. Name may be NULL in which case the first compression method in the internal table at stream.c that is mentioned as acceptable by the client will be used. NOTE: the compression translation, same as h2 support, relies on the user code using LWS_WRITE_HTTP and then LWS_WRITE_HTTP_FINAL on the last part written. The internal lws fileserving code already does this.
2018-09-02 14:43:05 +08:00
if (LWS_WITH_HTTP_STREAM_COMPRESSION)
list(APPEND SOURCES
lib/roles/http/compression/stream.c
lib/roles/http/compression/deflate/deflate.c)
if (LWS_WITH_HTTP_BROTLI)
list(APPEND SOURCES
lib/roles/http/compression/brotli/brotli.c)
endif()
endif()
refactor: most preparation for -DLWS_ROLE_H1=0
2018-04-27 19:16:50 +08:00
endif()
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
if (LWS_ROLE_H1)
list(APPEND SOURCES
lib/roles/h1/ops-h1.c)
endif()
if (LWS_ROLE_WS)
list(APPEND SOURCES
lib/roles/ws/ops-ws.c)
if (NOT LWS_WITHOUT_CLIENT)
list(APPEND SOURCES
lib/roles/ws/client-ws.c
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
lib/roles/ws/client-parser-ws.c)
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
endif()
if (NOT LWS_WITHOUT_SERVER)
list(APPEND SOURCES
lib/roles/ws/server-ws.c)
endif()
endif()
if (LWS_ROLE_RAW)
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
list(APPEND SOURCES
refactor: split out adoption and client apis to core - split raw role into separate skt and file - remove all special knowledge from the adoption apis and migrate to core - remove all special knowledge from client_connect stuff, and have it discovered by iterating the role callbacks to let those choose how to bind; migrate to core - retire the old deprecated client apis pre- client_connect_info
2018-05-10 16:13:26 +08:00
lib/roles/raw-skt/ops-raw-skt.c
lib/roles/raw-file/ops-raw-file.c)
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
if (LWS_WITH_ABSTRACT)
list(APPEND SOURCES
lib/abstract/transports/raw-skt.c)
endif()
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
endif()
role: raw-proxy
2018-11-29 08:29:48 +08:00
if (LWS_ROLE_RAW_PROXY)
list(APPEND SOURCES
lib/roles/raw-proxy/ops-raw-proxy.c)
endif()
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
if (LWS_ROLE_CGI)
list(APPEND SOURCES
lib/roles/cgi/cgi-server.c
lib/roles/cgi/ops-cgi.c)
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
endif()
role: dbus This adds support for the integrating libdbus into the lws event loop. Unlike the other roles, lws doesn't completely adopt the fd and libdbus insists to retain control over the fd lifecycle. However libdbus provides apis for foreign code (lws) to provide event loop services to libdbus for the fd. Accordingly, unlike the other roles rx and writeable are not subsumed into lws callback messages and the events remain the property of libdbus. A context struct wrapper is provided that is available in the libdbus callbacks to bridge between the lws and dbus worlds, along with a minimal example dbus client and server.
2018-10-02 10:50:24 +08:00
if (LWS_ROLE_DBUS)
list(APPEND SOURCES
lib/roles/dbus/dbus.c)
endif()
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
if (LWS_WITH_ACCESS_LOG)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/http/server/access-log.c)
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
endif()
if (LWS_WITH_PEER_LIMITS)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/misc/peer-limits.c)
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
endif()
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
lwsac Introduce an api for efficiently dealing with allocations for large, unknown amounts of objects.
2018-10-14 06:12:27 +08:00
if (LWS_WITH_LWSAC)
list(APPEND SOURCES
lib/misc/lwsac/lwsac.c
lib/misc/lwsac/cached-file.c)
endif()
fulltext search
2018-10-14 11:38:08 +08:00
if (LWS_WITH_FTS)
list(APPEND SOURCES
lib/misc/fts/trie.c
lib/misc/fts/trie-fd.c)
endif()
lws_diskcache: split generic parts from gitohashi into lws
2018-11-12 15:24:42 +08:00
if (LWS_WITH_DISKCACHE)
list(APPEND SOURCES
lib/misc/diskcache.c)
endif()
lws_struct lws_struct JSON + sqlite3 serializer and deserializer See READMEs/README.lws_struct.md
2019-03-30 22:14:15 +08:00
if (LWS_WITH_STRUCT_JSON)
list(APPEND SOURCES
lib/misc/lws-struct-lejp.c)
endif()
if (LWS_WITH_STRUCT_SQLITE3)
list(APPEND SOURCES
lib/misc/lws-struct-sqlite.c)
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_CLIENT)
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
list(APPEND SOURCES
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
lib/core-net/connect.c
lib/core-net/client.c
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/http/client/client.c
lib/roles/http/client/client-handshake.c)
endif()
if (NOT LWS_WITHOUT_SERVER)
list(APPEND SOURCES
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
lib/core-net/server.c
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/listen/ops-listen.c)
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
endif()
http2: make usable HTTP/2 support is now able to serve the test server, complete with websockets, from a single vhost. - This works the same with both OpenSSL and mbedTLS. - POST is now wired up and works (also for file upload). - CGI is wired up and works. - Redirect is adapted and works - lwsws works. - URI urldecode, sanitation and argument parsing wired up for :path valgrind clean (aside from openssl-style false uninit data usage in mbedtls send occasionally) h2spec reports: $ h2spec -h 127.0.0.1 -p 7681 -t -k -o 1 ... 145 tests, 145 passed, 0 skipped, 0 failed" Incorporates: - "https://github.com/warmcat/libwebsockets/pull/1039 Fixes issue with -Werror=unused-variable flag - https://github.com/sartura/libwebsockets/commit/2c843a1395bdca5c23b40d989f508fc96aa5ba3b ssl: fix infinite loop on client cert verification failure Signed-off-by: Petar Paradzik <petar.paradzik@sartura.hr>" Caused and fixes Coverity 184887 - 184892
2017-10-13 10:33:02 +08:00
if (LWS_WITH_MBEDTLS)
mbedtls: Add mbedTLS backend support
2017-08-28 20:22:20 +08:00
set(LWS_WITH_SSL ON)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
include_directories(lib/tls/mbedtls/wrapper/include)
include_directories(lib/tls/mbedtls/wrapper/include/platform)
include_directories(lib/tls/mbedtls/wrapper/include/internal)
include_directories(lib/tls/mbedtls/wrapper/include/openssl)
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_NETWORK)
list(APPEND HDR_PRIVATE
lib/tls/mbedtls/wrapper/include/internal/ssl3.h
lib/tls/mbedtls/wrapper/include/internal/ssl_cert.h
lib/tls/mbedtls/wrapper/include/internal/ssl_code.h
lib/tls/mbedtls/wrapper/include/internal/ssl_dbg.h
lib/tls/mbedtls/wrapper/include/internal/ssl_lib.h
lib/tls/mbedtls/wrapper/include/internal/ssl_methods.h
lib/tls/mbedtls/wrapper/include/internal/ssl_pkey.h
lib/tls/mbedtls/wrapper/include/internal/ssl_stack.h
lib/tls/mbedtls/wrapper/include/internal/ssl_types.h
lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h
lib/tls/mbedtls/wrapper/include/internal/tls1.h
lib/tls/mbedtls/wrapper/include/internal/x509_vfy.h)
list(APPEND HDR_PRIVATE
lib/tls/mbedtls/wrapper/include/openssl/ssl.h)
list(APPEND HDR_PRIVATE
lib/tls/mbedtls/wrapper/include/platform/ssl_pm.h
lib/tls/mbedtls/wrapper/include/platform/ssl_port.h)
list(APPEND SOURCES
lib/tls/mbedtls/wrapper/library/ssl_cert.c
lib/tls/mbedtls/wrapper/library/ssl_lib.c
lib/tls/mbedtls/wrapper/library/ssl_methods.c
lib/tls/mbedtls/wrapper/library/ssl_pkey.c
lib/tls/mbedtls/wrapper/library/ssl_stack.c
lib/tls/mbedtls/wrapper/library/ssl_x509.c)
list(APPEND SOURCES
lib/tls/mbedtls/wrapper/platform/ssl_pm.c
lib/tls/mbedtls/wrapper/platform/ssl_port.c)
endif()
mbedtls: Add mbedTLS wrapper This wrapper has come from Espressif's esp-idf https://github.com/espressif/esp-idf/tree/master/components/openssl under Apache 2.0, at or around commit 3e4627479b6fff6b652de6d2f0302101e51ee5c2
2017-08-28 20:13:58 +08:00
endif()
mbedtls: Add mbedTLS backend support
2017-08-28 20:22:20 +08:00
if (LWS_WITH_SSL)
list(APPEND SOURCES
lws-genrsa: add resuable backend-independent rsa decrypt in tls/ and migrate sshd to it
2017-10-19 11:21:27 +08:00
lib/tls/tls.c
)
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_NETWORK)
list(APPEND SOURCES
lib/tls/tls-network.c
)
endif()
mbedtls: Add mbedTLS backend support
2017-08-28 20:22:20 +08:00
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_MBEDTLS)
list(APPEND SOURCES
lib/tls/mbedtls/tls.c
lib/tls/mbedtls/x509.c
)
if (LWS_WITH_NETWORK)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
list(APPEND SOURCES
lws_genhash: add HMAC Like the simple hashes, these work the same regardless of if the backend is OpenSSL or mbedTLS. Also move into ./lib/tls/ and split into two specific to mbedtls or openssl backends.
2017-10-18 19:14:11 +08:00
lib/tls/mbedtls/ssl.c
lws-genrsa: add resuable backend-independent rsa decrypt in tls/ and migrate sshd to it
2017-10-19 11:21:27 +08:00
)
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
endif()
if (LWS_WITH_GENCRYPTO)
list(APPEND SOURCES
lib/tls/mbedtls/lws-genhash.c
lib/tls/mbedtls/lws-genrsa.c
lib/tls/mbedtls/lws-genaes.c
lib/tls/lws-genec-common.c
lib/tls/mbedtls/lws-genec.c
lib/tls/mbedtls/lws-gencrypto.c
)
endif()
else()
list(APPEND SOURCES
lib/tls/openssl/tls.c
lib/tls/openssl/x509.c
)
if (LWS_WITH_NETWORK)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
list(APPEND SOURCES
lws_genhash: add HMAC Like the simple hashes, these work the same regardless of if the backend is OpenSSL or mbedTLS. Also move into ./lib/tls/ and split into two specific to mbedtls or openssl backends.
2017-10-18 19:14:11 +08:00
lib/tls/openssl/ssl.c
)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
endif()
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_GENCRYPTO)
list(APPEND SOURCES
lib/tls/openssl/lws-genhash.c
lib/tls/openssl/lws-genrsa.c
lib/tls/openssl/lws-genaes.c
lib/tls/lws-genec-common.c
lib/tls/openssl/lws-genec.c
lib/tls/openssl/lws-gencrypto.c
)
endif()
endif()
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
mbedtls: Add mbedTLS backend support
2017-08-28 20:22:20 +08:00
if (NOT LWS_WITHOUT_SERVER)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/tls/tls-server.c)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
if (LWS_WITH_MBEDTLS)
list(APPEND SOURCES
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
lib/tls/mbedtls/mbedtls-server.c)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
else()
list(APPEND SOURCES
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
lib/tls/openssl/openssl-server.c)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
endif()
mbedtls: Add mbedTLS backend support
2017-08-28 20:22:20 +08:00
endif()
if (NOT LWS_WITHOUT_CLIENT)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/tls/tls-client.c)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
if (LWS_WITH_MBEDTLS)
list(APPEND SOURCES
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
lib/tls/mbedtls/mbedtls-client.c)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
else()
list(APPEND SOURCES
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
lib/tls/openssl/openssl-client.c)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
endif()
mbedtls: Add mbedTLS backend support
2017-08-28 20:22:20 +08:00
endif()
endif()
mbedtls: Add mbedTLS wrapper This wrapper has come from Espressif's esp-idf https://github.com/espressif/esp-idf/tree/master/components/openssl under Apache 2.0, at or around commit 3e4627479b6fff6b652de6d2f0302101e51ee5c2
2017-08-28 20:13:58 +08:00
LWS_WITHOUT_BUILTIN_SHA1 Signed-off-by: Andy Green <andy.green@linaro.org>
2015-10-15 11:20:40 +08:00
if (NOT LWS_WITHOUT_BUILTIN_SHA1)
list(APPEND SOURCES
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
lib/misc/sha-1.c)
LWS_WITHOUT_BUILTIN_SHA1 Signed-off-by: Andy Green <andy.green@linaro.org>
2015-10-15 11:20:40 +08:00
endif()
LWS_WITH_MINIMAL_EXAMPLES: default-off build all minimal samples after lws for QA This adds an lws cmake option that builds all the minimal examples as part of lws, it's useful for QA. It adds a macro to examples that depend on a particular lws configuration to understand they should just null out their project definition in builds where the lws configuration requirement is not met, and we are building as part of lws. It also adapts all the example library additions to select the just-built-but-not-yet-installed library in the case it is built as part of lws. If built standalone, it now uses the cmake platform-abstracted way to add the library requirement too.
2018-03-17 06:43:12 +08:00
if (LWS_WITH_HTTP2 AND NOT LWS_WITHOUT_SERVER)
http2 add initial alpn support Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-03 14:33:48 +08:00
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/h2/http2.c
lib/roles/h2/hpack.c
lib/roles/h2/ops-h2.c)
http2 add initial alpn support Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-03 14:33:48 +08:00
endif()
plat change to build selection by cmake Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-02 21:02:54 +08:00
# select the active platform files
if (WIN32)
list(APPEND SOURCES
plat: refactor private headers and split files Also remove LWS_VISIBLE that are not necessary from plat apis
2018-06-16 09:37:07 +08:00
lib/plat/windows/windows-fds.c
lib/plat/windows/windows-file.c
lib/plat/windows/windows-init.c
lib/plat/windows/windows-misc.c
lib/plat/windows/windows-pipe.c
plugins: remove requirement for libuv on unix
2019-04-21 19:46:41 +01:00
lib/plat/windows/windows-plugins.c
plat: refactor private headers and split files Also remove LWS_VISIBLE that are not necessary from plat apis
2018-06-16 09:37:07 +08:00
lib/plat/windows/windows-service.c
lib/plat/windows/windows-sockets.c
)
plat change to build selection by cmake Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-02 21:02:54 +08:00
else()
mbed3: sayonara The port was technically worthwhile and laid the groundwork for ESP support. But now it is just useless cruft like mbed3 itself...
2017-02-22 09:50:11 +08:00
plat: remove esp8266 ESP32 module price is now within range of 8266 price. ESP32 capability and OS support is hugely better than 8266, we can support mbedtls tls, http/2 etc with ESP32. I'm no longer testing on ESP8266... there's no more user traffic... it's time to go.
2017-11-30 12:40:46 +08:00
if (LWS_PLAT_OPTEE)
mbed3 build support Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-02 08:21:08 +08:00
list(APPEND SOURCES
adopt: keep most of adopt.c even with WITHOUT_SERVER
2019-01-11 13:13:34 +08:00
lib/plat/optee/lws-plat-optee.c
)
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_NETWORK)
list(APPEND SOURCES
lib/plat/optee/network.c
)
endif()
mbed3 build support Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-02 08:21:08 +08:00
else()
plat: remove esp8266 ESP32 module price is now within range of 8266 price. ESP32 capability and OS support is hugely better than 8266, we can support mbedtls tls, http/2 etc with ESP32. I'm no longer testing on ESP8266... there's no more user traffic... it's time to go.
2017-11-30 12:40:46 +08:00
if (LWS_WITH_ESP32)
esp8266 initial support
2016-07-23 14:18:25 +08:00
list(APPEND SOURCES
plat: refactor private headers and split files Also remove LWS_VISIBLE that are not necessary from plat apis
2018-06-16 09:37:07 +08:00
lib/plat/esp32/esp32-fds.c
lib/plat/esp32/esp32-file.c
lib/plat/esp32/esp32-init.c
lib/plat/esp32/esp32-misc.c
lib/plat/esp32/esp32-pipe.c
lib/plat/esp32/esp32-service.c
lib/plat/esp32/esp32-sockets.c
plat: remove esp8266 ESP32 module price is now within range of 8266 price. ESP32 capability and OS support is hugely better than 8266, we can support mbedtls tls, http/2 etc with ESP32. I'm no longer testing on ESP8266... there's no more user traffic... it's time to go.
2017-11-30 12:40:46 +08:00
lib/misc/romfs.c)
esp32: do not compile esp32-helper by default ...as it is highly coupled with other ESP-IDF components and should be written
2019-07-01 14:56:02 +01:00
if(LWS_WITH_ESP32_HELPER)
list(APPEND SOURCES lib/plat/esp32/esp32-helpers.c)
endif()
esp8266 initial support
2016-07-23 14:18:25 +08:00
else()
sul: all timed objects use a single pt sul list wsi timeout, wsi hrtimer, sequencer timeout and vh-protocol timer all now participate on a single sorted us list. The whole idea of polling wakes is thrown out, poll waits ignore the timeout field and always use infinite timeouts. Introduce a public api that can schedule its own callback from the event loop with us resolution (usually ms is all the platform can do). Upgrade timeouts and sequencer timeouts to also be able to use us resolution. Introduce a prepared fakewsi in the pt, so we don't have to allocate one on the heap when we need it. Directly handle vh-protocol timer if LWS_MAX_SMP == 1
2019-08-09 10:12:09 +01:00
set(LWS_PLAT_UNIX 1)
plat: remove esp8266 ESP32 module price is now within range of 8266 price. ESP32 capability and OS support is hugely better than 8266, we can support mbedtls tls, http/2 etc with ESP32. I'm no longer testing on ESP8266... there's no more user traffic... it's time to go.
2017-11-30 12:40:46 +08:00
list(APPEND SOURCES
plat: refactor private headers and split files Also remove LWS_VISIBLE that are not necessary from plat apis
2018-06-16 09:37:07 +08:00
lib/plat/unix/unix-caps.c
lib/plat/unix/unix-file.c
lib/plat/unix/unix-misc.c
lib/plat/unix/unix-init.c
)
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_NETWORK)
list(APPEND SOURCES
lib/plat/unix/unix-pipe.c
lib/plat/unix/unix-service.c
lib/plat/unix/unix-sockets.c
lib/plat/unix/unix-fds.c
)
endif()
plat: refactor private headers and split files Also remove LWS_VISIBLE that are not necessary from plat apis
2018-06-16 09:37:07 +08:00
if (LWS_WITH_PLUGINS AND LWS_WITH_LIBUV)
list(APPEND SOURCES lib/plat/unix/unix-plugins.c)
endif()
esp8266 initial support
2016-07-23 14:18:25 +08:00
endif()
mbed3 build support Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-02 08:21:08 +08:00
endif()
plat change to build selection by cmake Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-02 21:02:54 +08:00
endif()
refactor: most preparation for -DLWS_ROLE_H1=0
2018-04-27 19:16:50 +08:00
if ((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_SERVER)
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/http/server/server.c
lib/roles/http/server/lws-spa.c)
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
endif()
refactor: most preparation for -DLWS_ROLE_H1=0
2018-04-27 19:16:50 +08:00
if (LWS_ROLE_WS AND NOT LWS_WITHOUT_EXTENSIONS)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
list(APPEND HDR_PRIVATE
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/ws/ext/extension-permessage-deflate.h)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/ws/ext/extension.c
lib/roles/ws/ext/extension-permessage-deflate.c)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
endif()
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
if (LWS_WITH_HTTP_PROXY)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/http/server/rewrite.c)
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
endif()
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_POLL AND LWS_WITH_NETWORK)
refactor libev eliminate all code ifdefs Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-11 13:14:37 +08:00
list(APPEND SOURCES
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
lib/event-libs/poll/poll.c)
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
endif()
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_LIBUV AND LWS_WITH_NETWORK)
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
list(APPEND SOURCES
refactor: isolate event_loop struct content same way as roles
2018-04-29 08:34:19 +08:00
lib/event-libs/libuv/libuv.c)
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
endif()
refactor libev eliminate all code ifdefs Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-11 13:14:37 +08:00
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_LIBEVENT AND LWS_WITH_NETWORK)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
list(APPEND SOURCES
refactor: isolate event_loop struct content same way as roles
2018-04-29 08:34:19 +08:00
lib/event-libs/libevent/libevent.c)
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
endif()
LWS_WITH_NETWORK: cmake option for no network code
2019-01-13 06:58:21 +08:00
if (LWS_WITH_LIBEV AND LWS_WITH_NETWORK)
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
list(APPEND SOURCES
lib/event-libs/libev/libev.c)
CMakeLists.txt: fix build with libev and without testapps Move libev workaround outside the if ((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_TESTAPPS) block otherwise build fails on: /home/naourr/work/instance-1/output-1/build/libwebsockets-3.2.0/lib/event-libs/libev/libev.c: In function 'lws_ev_hrtimer_cb': /home/naourr/work/instance-1/output-1/build/libwebsockets-3.2.0/lib/event-libs/libev/libev.c:34:3: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing] ev_timer_set(&pt->ev.hrtimer, ((float)us) / 1000000.0, 0); ^~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/b5a2188dce90f3ca9bf0cc7a043c1a946b8e288f AG: this doesn't really fix anything... the spew is intentionally part of libev. It just hides the spew... since the maintainer won't fix it this is the only way AFAIK. Other than don't use libev. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-10-06 14:45:15 +02:00
# libev generates a big mess of warnings with gcc, maintainer claims gcc to blame
set_source_files_properties( lib/event-libs/libev/libev.c PROPERTIES COMPILE_FLAGS "-Wno-error" )
refactor: apply ops structs to event loop handlers
2018-04-29 10:44:36 +08:00
endif()
lejp bring into lws lejp is already in lws as part of lwsws. However it's too generally useful to just put directly in lwsws, it will lead to multiple copies of the source in differet subprojects. This moves it directly into lws, lwsws now gets it from there. Like lwsws, by default at cmake it is disabled. Selecting LWS_WITH_LWSWS now selects LWS_WITH_LEJP and you can set that at cmake individually as well. Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-10 09:47:10 +08:00
if (LWS_WITH_LEJP)
list(APPEND SOURCES
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
lib/misc/lejp.c)
lejp bring into lws lejp is already in lws as part of lwsws. However it's too generally useful to just put directly in lwsws, it will lead to multiple copies of the source in differet subprojects. This moves it directly into lws, lwsws now gets it from there. Like lwsws, by default at cmake it is disabled. Selecting LWS_WITH_LWSWS now selects LWS_WITH_LEJP and you can set that at cmake individually as well. Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-10 09:47:10 +08:00
endif()
optee: remove build system
2019-01-15 06:59:48 +08:00
if (LWS_WITH_LEJP_CONF AND LWS_WITH_NETWORK AND NOT LWS_PLAT_OPTEE)
lwsws conf.c migrate to lib Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-26 21:12:11 +08:00
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
"lib/roles/http/server/lejp-conf.c"
lwsws conf.c migrate to lib Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-26 21:12:11 +08:00
)
endif()
lejp bring into lws lejp is already in lws as part of lwsws. However it's too generally useful to just put directly in lwsws, it will lead to multiple copies of the source in differet subprojects. This moves it directly into lws, lwsws now gets it from there. Like lwsws, by default at cmake it is disabled. Selecting LWS_WITH_LWSWS now selects LWS_WITH_LEJP and you can set that at cmake individually as well. Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-10 09:47:10 +08:00
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
if (LWS_WITH_ABSTRACT)
list(APPEND SOURCES
lib/abstract/transports/unit-test.c)
endif()
smtp Signed-off-by: Andy Green <andy@warmcat.com>
2016-06-07 09:49:59 +08:00
if (LWS_WITH_SMTP)
list(APPEND SOURCES
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
lib/abstract/protocols/smtp/smtp.c)
smtp Signed-off-by: Andy Green <andy@warmcat.com>
2016-06-07 09:49:59 +08:00
endif()
RFC7233 HTTP Ranges support for server This adds a serverside implementation of RFC7233 HTTP ranges. - LWS_WITH_RANGES is on by default at cmake - Accept-Ranges: bytes is added if LWS_WITH_RANGES is enabled - Both single ranges and multipart (2+) ranges are supported Test with curl like this Single $ $ curl -s -r 64-95 http://localhost:7681/libwebsockets.org-logo.png | hexdump -C 00000000 2e 01 fd 9d 12 27 00 00 00 19 74 45 58 74 53 6f |.....'....tEXtSo| 00000010 66 74 77 61 72 65 00 77 77 77 2e 69 6e 6b 73 63 |ftware.www.inksc| Multipart $ curl -s -r 64-95,128-143 http://localhost:7681/libwebsockets.org-logo.png | hexdump -C 00000000 5f 6c 77 73 0d 0a 43 6f 6e 74 65 6e 74 2d 54 79 |_lws..Content-Ty| 00000010 70 65 3a 20 69 6d 61 67 65 2f 70 6e 67 0d 0a 43 |pe: image/png..C| 00000020 6f 6e 74 65 6e 74 2d 52 61 6e 67 65 3a 20 62 79 |ontent-Range: by| 00000030 74 65 73 20 36 34 2d 39 35 2f 37 30 32 39 0d 0a |tes 64-95/7029..| 00000040 0d 0a 2e 01 fd 9d 12 27 00 00 00 19 74 45 58 74 |.......'....tEXt| 00000050 53 6f 66 74 77 61 72 65 00 77 77 77 2e 69 6e 6b |Software.www.ink| 00000060 73 63 5f 6c 77 73 0d 0a 43 6f 6e 74 65 6e 74 2d |sc_lws..Content-| 00000070 54 79 70 65 3a 20 69 6d 61 67 65 2f 70 6e 67 0d |Type: image/png.| 00000080 0a 43 6f 6e 74 65 6e 74 2d 52 61 6e 67 65 3a 20 |.Content-Range: | 00000090 62 79 74 65 73 20 31 32 38 2d 31 34 33 2f 37 30 |bytes 128-143/70| 000000a0 32 39 0d 0a 0d 0a 05 14 50 40 05 15 a5 c4 60 43 |29......P@....`C| 000000b0 91 c4 4a d4 c4 fc 5f 6c 77 73 0d 00 |..J..._lws..| The corresponding header part is like this 0x0030: 4854 5450 2f31 2e31 2032 3036 HTTP/1.1.206 0x0040: 200d 0a73 6572 7665 723a 206c 7773 7773 ...server:.lwsws 0x0050: 0d0a 636f 6e74 656e 742d 7479 7065 3a20 ..content-type:. 0x0060: 6d75 6c74 6970 6172 742f 6279 7465 7261 multipart/bytera 0x0070: 6e67 6573 0d0a 6163 6365 7074 2d72 616e nges..accept-ran 0x0080: 6765 733a 2062 7974 6573 0d0a 636f 6e74 ges:.bytes..cont 0x0090: 656e 742d 6c65 6e67 7468 3a20 3138 380d ent-length:.188. 0x00a0: 0a63 6163 6865 2d63 6f6e 7472 6f6c 3a20 .cache-control:. 0x00b0: 7072 6976 6174 6520 6d61 782d 6167 653a private.max-age: 0x00c0: 2036 300d 0a63 6f6e 6e65 6374 696f 6e3a .60..connection: 0x00d0: 206b 6565 702d 616c 6976 650d 0a65 7461 .keep-alive..eta 0x00e0: 673a 2030 3030 3031 4237 3535 3444 3433 g:.00001B7554D43 0x00f0: 3033 330d 0a0d 0a 033....
2016-12-12 13:36:25 +08:00
if (LWS_WITH_RANGES)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/http/server/ranges.c)
RFC7233 HTTP Ranges support for server This adds a serverside implementation of RFC7233 HTTP ranges. - LWS_WITH_RANGES is on by default at cmake - Accept-Ranges: bytes is added if LWS_WITH_RANGES is enabled - Both single ranges and multipart (2+) ranges are supported Test with curl like this Single $ $ curl -s -r 64-95 http://localhost:7681/libwebsockets.org-logo.png | hexdump -C 00000000 2e 01 fd 9d 12 27 00 00 00 19 74 45 58 74 53 6f |.....'....tEXtSo| 00000010 66 74 77 61 72 65 00 77 77 77 2e 69 6e 6b 73 63 |ftware.www.inksc| Multipart $ curl -s -r 64-95,128-143 http://localhost:7681/libwebsockets.org-logo.png | hexdump -C 00000000 5f 6c 77 73 0d 0a 43 6f 6e 74 65 6e 74 2d 54 79 |_lws..Content-Ty| 00000010 70 65 3a 20 69 6d 61 67 65 2f 70 6e 67 0d 0a 43 |pe: image/png..C| 00000020 6f 6e 74 65 6e 74 2d 52 61 6e 67 65 3a 20 62 79 |ontent-Range: by| 00000030 74 65 73 20 36 34 2d 39 35 2f 37 30 32 39 0d 0a |tes 64-95/7029..| 00000040 0d 0a 2e 01 fd 9d 12 27 00 00 00 19 74 45 58 74 |.......'....tEXt| 00000050 53 6f 66 74 77 61 72 65 00 77 77 77 2e 69 6e 6b |Software.www.ink| 00000060 73 63 5f 6c 77 73 0d 0a 43 6f 6e 74 65 6e 74 2d |sc_lws..Content-| 00000070 54 79 70 65 3a 20 69 6d 61 67 65 2f 70 6e 67 0d |Type: image/png.| 00000080 0a 43 6f 6e 74 65 6e 74 2d 52 61 6e 67 65 3a 20 |.Content-Range: | 00000090 62 79 74 65 73 20 31 32 38 2d 31 34 33 2f 37 30 |bytes 128-143/70| 000000a0 32 39 0d 0a 0d 0a 05 14 50 40 05 15 a5 c4 60 43 |29......P@....`C| 000000b0 91 c4 4a d4 c4 fc 5f 6c 77 73 0d 00 |..J..._lws..| The corresponding header part is like this 0x0030: 4854 5450 2f31 2e31 2032 3036 HTTP/1.1.206 0x0040: 200d 0a73 6572 7665 723a 206c 7773 7773 ...server:.lwsws 0x0050: 0d0a 636f 6e74 656e 742d 7479 7065 3a20 ..content-type:. 0x0060: 6d75 6c74 6970 6172 742f 6279 7465 7261 multipart/bytera 0x0070: 6e67 6573 0d0a 6163 6365 7074 2d72 616e nges..accept-ran 0x0080: 6765 733a 2062 7974 6573 0d0a 636f 6e74 ges:.bytes..cont 0x0090: 656e 742d 6c65 6e67 7468 3a20 3138 380d ent-length:.188. 0x00a0: 0a63 6163 6865 2d63 6f6e 7472 6f6c 3a20 .cache-control:. 0x00b0: 7072 6976 6174 6520 6d61 782d 6167 653a private.max-age: 0x00c0: 2036 300d 0a63 6f6e 6e65 6374 696f 6e3a .60..connection: 0x00d0: 206b 6565 702d 616c 6976 650d 0a65 7461 .keep-alive..eta 0x00e0: 673a 2030 3030 3031 4237 3535 3444 3433 g:.00001B7554D43 0x00f0: 3033 330d 0a0d 0a 033....
2016-12-12 13:36:25 +08:00
endif()
junzip: style and migrate header into private-libwebsockets.h Also introduce CMake LWS_WITH_ZIP_FOPS defaulting to ON that builds junzip.c and make sure this is exported in lws_config.h (included by libwebsockets.h) Improve lws handling of stdint.h import or simulate it.
2017-03-03 09:19:14 +08:00
if (LWS_WITH_ZIP_FOPS)
fops_zip: require libz
2017-03-09 19:21:40 +08:00
if (LWS_WITH_ZLIB)
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/roles/http/server/fops-zip.c)
fops_zip: require libz
2017-03-09 19:21:40 +08:00
else()
message(FATAL_ERROR "Pre-zipped file support (LWS_WITH_ZIP_FOPS) requires ZLIB (LWS_WITH_ZLIB)")
endif()
junzip: style and migrate header into private-libwebsockets.h Also introduce CMake LWS_WITH_ZIP_FOPS defaulting to ON that builds junzip.c and make sure this is exported in lws_config.h (included by libwebsockets.h) Improve lws handling of stdint.h import or simulate it.
2017-03-03 09:19:14 +08:00
endif()
jwe
2018-12-13 20:05:12 +08:00
if (LWS_WITH_JOSE)
JWK + JWS: JSON Web Keys RFC7517 + Signatures support RFC7515 This adds some optional apis around JSON Web Keys and JSON Web Signatures. HMAC SHA256/384/512 and RSA + SHA256/384/512 are supported. This also add a new "LWS_WITH_SELFTESTS" that enables the selftests.
2017-10-18 19:27:38 +08:00
list(APPEND SOURCES
JOSE: refactor and prepare for JWE Until now the JOSE pieces only had enough support for ACME. This patch improves the JWK parsing to prepare for more complete support and for adding JWE, genaes and genec in later patches.
2018-11-27 08:36:08 +08:00
lib/jose/jwk/jwk.c
lib/jose/jws/jose.c
jwe
2018-12-13 20:05:12 +08:00
lib/jose/jws/jws.c
lib/jose/jwe/jwe.c
ecdh-es Mainly JWE support for ecdh-es and initial refactor to support multiple recipients / signatures.
2018-12-24 07:42:03 +08:00
lib/jose/jwe/enc/aescbc.c
lib/jose/jwe/enc/aesgcm.c
lib/jose/jwe/enc/aeskw.c
jwe
2018-12-13 20:05:12 +08:00
lib/jose/jwe/jwe-rsa-aescbc.c
lib/jose/jwe/jwe-rsa-aesgcm.c
ecdh-es Mainly JWE support for ecdh-es and initial refactor to support multiple recipients / signatures.
2018-12-24 07:42:03 +08:00
lib/jose/jwe/jwe-ecdh-es-aeskw.c
jwe
2018-12-13 20:05:12 +08:00
)
JWK + JWS: JSON Web Keys RFC7517 + Signatures support RFC7515 This adds some optional apis around JSON Web Keys and JSON Web Signatures. HMAC SHA256/384/512 and RSA + SHA256/384/512 are supported. This also add a new "LWS_WITH_SELFTESTS" that enables the selftests.
2017-10-18 19:27:38 +08:00
endif()
jwe
2018-12-13 20:05:12 +08:00
if (LWS_WITH_JOSE OR LWS_WITH_GENCRYPTO)
genec: generic ECDH crypto layer !!! WIP This implements the "genec" layer wrapping mbedtls + openssl ECDH support. API tests are added for the parts that are implemented so far. Stuff related to ec at all, like keys, are prefixed lws_genec_. Stuff specific to ECDH are prefixed lws_genecdh_.
2018-12-05 13:11:03 +08:00
list(APPEND SOURCES
lib/tls/lws-gencrypto-common.c)
endif()
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
# Add helper files for Windows.
if (WIN32)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
set(WIN32_HELPERS_PATH win32port/win32helpers)
include_directories(${WIN32_HELPERS_PATH})
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
if (WIN32)
list(APPEND SOURCES
${WIN32_HELPERS_PATH}/gettimeofday.c
)
list(APPEND HDR_PRIVATE
${WIN32_HELPERS_PATH}/gettimeofday.h
)
endif(WIN32)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
else()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
# Unix.
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_DAEMONIZE)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
list(APPEND SOURCES
refactor role ops This only refactors internal architecture and representations, the user api is unaffected.
2018-04-11 13:39:42 +08:00
lib/misc/daemonize.c)
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
if (UNIX)
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
if (NOT LWS_HAVE_GETIFADDRS)
refactor: subdirs for source in lib Split out some optional code into own sources to shrink down libwebsockets.c and server.c a bit
2017-10-16 12:52:32 +08:00
list(APPEND HDR_PRIVATE lib/misc/getifaddrs.h)
list(APPEND SOURCES lib/misc/getifaddrs.c)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
cmake add gcc compile options Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-16 12:32:59 +08:00
cmake: clang: Fix LWS_WITH_ASAN Building with LWS_WITH_ASAN was broken when using Clang, due to some flags being given that Clang doesn't recognize. Fixed this by adding those flags only when the compiler isn't Clang.
2019-06-20 16:16:03 -07:00
if ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
set(COMPILER_IS_CLANG ON)
endif()
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
Add compiler checking for visibility flag Signed-off-by: Steven Lai <steven.lai@liricco.com>
2015-01-27 19:46:26 +08:00
include (CheckCCompilerFlag)
Use LWS_HAVE_ instead of just HAVE_ Since we include lws_config.h in the public headers, at least our HAVE_ macros should be kind of unique, so that we don't get redefinitions when used with other libraries using config files as well.
2015-06-24 16:46:02 +02:00
CHECK_C_COMPILER_FLAG(-fvisibility=hidden LWS_HAVE_VISIBILITY)
if (LWS_HAVE_VISIBILITY)
Add compiler checking for visibility flag Signed-off-by: Steven Lai <steven.lai@liricco.com>
2015-01-27 19:46:26 +08:00
set(VISIBILITY_FLAG -fvisibility=hidden)
endif()
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
if (LWS_WITH_GCOV)
cmake: override build system release optimization policy The cmake config on the build system actually decides the release build optimization policy. On Fedora, it's -O2. On Ubuntu, it's -O3. Anything given in CMakeLists.txt is overridden by the build system policy since it goes at the end of the compiler commandline. When you are building cross, the build system's opinion of your cross binary optimization level is irrelevant, and at worst destructive. Some versions of gcc contain broken optimizations that are applied only at -O3. This patch removes any doomed attempt to set -O in CMakeLists.txt, which has no effect since the build system policy is still added at the end, but removes confusion; and adds code to all the cross build files to forcibly override release optimization level to -O2, removing the build system's opinion of how your cross build should look.
2019-02-28 07:05:12 +08:00
set (GCOV_FLAGS "-fprofile-arcs -ftest-coverage ")
gcov: add in cmake and adapt defaults 1) Introduce LWS_WITH_GCOV to build with gcc / clang coverage instrumentation. $ cd build $ make clean && rm -f `find . -name "*.gcno" -o -name "*.gcda"` && make -j16 && sudo make install && sudo /usr/local/bin/libwebsockets-test-server -s ... $ gcov `find . -name *.c.gcno | grep -v test-apps` -b | sed "/\.h.\$/,/^$/d" The above are available in two helper scripts - scripts/build-gcov.sh - scripts/gcov.sh 2) CMake defaults changed: - LWS_WITH_ZIP_FOPS: OFF - LWS_WITH_RANGES: OFF - LWS_WITHOUT_EXTENSIONS: ON - LWS_WITH_ZLIB: OFF New CMake controls that default-OFF: - LWS_WITH_GENHASH - LWS_WITH_GENRSA these are implied by LWS_WITH_JWS (which is implied by LWS_WITH_ACME) 3) rename ./lib/tls/XXX/server.c and client.c to XXX-server.c / XXX-client.c. This is because gcov dumps its results using the .c filename part only, the copies overwrite each other if there are different .c files in the tree with the same filename part. 4) Add onetime test-client mode and test to ./test-apps/attack.sh 5) Add gcov howto in READMEs/README.build.md using attack.sh
2017-11-14 11:25:54 +08:00
endif()
autobahn fixes This replaces the old test-app for echo with separate client and server minimal versions. The autobahn test script is made more autonomous and tests both client and server.
2018-04-20 10:33:23 +08:00
LWS_WITH_ASAN This lets you build using the runtime Address Sanitizer in gcc. LWS is heavily tested with valgrind routinely during development. But ASAN did find some theoretical-only issues with shifting, strictly ~(1 << 31) is a signed int, it should be ~(1u << 31). Gcc does the same for both, but it's good to have the ability to find these.
2018-11-03 14:47:48 +08:00
if (LWS_WITH_ASAN)
cmake: clang: Fix LWS_WITH_ASAN Building with LWS_WITH_ASAN was broken when using Clang, due to some flags being given that Clang doesn't recognize. Fixed this by adding those flags only when the compiler isn't Clang.
2019-06-20 16:16:03 -07:00
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()
LWS_WITH_ASAN This lets you build using the runtime Address Sanitizer in gcc. LWS is heavily tested with valgrind routinely during development. But ASAN did find some theoretical-only issues with shifting, strictly ~(1 << 31) is a signed int, it should be ~(1u << 31). Gcc does the same for both, but it's good to have the ability to find these.
2018-11-03 14:47:48 +08:00
message("Enabling ASAN")
endif()
autobahn fixes This replaces the old test-app for echo with separate client and server minimal versions. The autobahn test script is made more autonomous and tests both client and server.
2018-04-20 10:33:23 +08:00
cmake: probe gcc flags capability old gcc doesn't have some of the extended warning flags we want to apply... use cmake to confirm the gcc has them before trying to use them.
2019-05-15 07:27:18 +01:00
check_c_compiler_flag("-Wignored-qualifiers" LWS_GCC_HAS_IGNORED_QUALIFIERS)
check_c_compiler_flag("-Wtype-limits" LWS_GCC_HAS_TYPE_LIMITS)
if (LWS_GCC_HAS_IGNORED_QUALIFIERS)
set(CMAKE_C_FLAGS "-Wignored-qualifiers ${CMAKE_C_FLAGS}" )
endif()
if (LWS_GCC_HAS_TYPE_LIMITS)
set(CMAKE_C_FLAGS "-Wtype-limits ${CMAKE_C_FLAGS}" )
endif()
plat: remove esp8266 ESP32 module price is now within range of 8266 price. ESP32 capability and OS support is hugely better than 8266, we can support mbedtls tls, http/2 etc with ESP32. I'm no longer testing on ESP8266... there's no more user traffic... it's time to go.
2017-11-30 12:40:46 +08:00
if (UNIX AND NOT LWS_WITH_ESP32)
cmake: probe gcc flags capability old gcc doesn't have some of the extended warning flags we want to apply... use cmake to confirm the gcc has them before trying to use them.
2019-05-15 07:27:18 +01:00
set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" )
fix cosmetic if end if name tag error
2016-10-05 10:15:16 +08:00
else()
cmake: probe gcc flags capability old gcc doesn't have some of the extended warning flags we want to apply... use cmake to confirm the gcc has them before trying to use them.
2019-05-15 07:27:18 +01:00
set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" )
fix cosmetic if end if name tag error
2016-10-05 10:15:16 +08:00
endif()
Check for GCC/G++ explicitly instead of simply Unix. Since we're setting gcc specific build flags.
2013-03-23 08:55:02 +08:00
endif ()
cmake add gcc compile options Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-16 12:32:59 +08:00
optee: remove build system
2019-01-15 06:59:48 +08:00
if (LWS_PLAT_OPTEE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot ../../../../lib/libutils/isoc/include -I../../../../lib/libutils/isoc/include -I../../../../lib/libutils/ext/include" )
endif()
pthreads only as needed This just lets you build lws 1.6 without pthreads if your OS / toolchain makes that possible, in the case you don't build the test apps (libwebsockets-test-server-pthreads needs it) Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-25 21:39:07 +08:00
if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT LWS_WITHOUT_TESTAPPS)
pthreads: build test server based on pthreads.h availability ... and fix signed / unsigned comparison
2018-03-02 09:01:22 +08:00
if (UNIX AND LWS_HAVE_PTHREAD_H)
osx clang blows up if pthreads flag at link time Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-29 19:41:13 +08:00
# jeez clang understands -pthread but dies if he sees it at link time!
# http://stackoverflow.com/questions/2391194/what-is-gs-pthread-equiv-in-clang
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread" )
endif()
endif()
cmake: clang: Fix LWS_WITH_ASAN Building with LWS_WITH_ASAN was broken when using Clang, due to some flags being given that Clang doesn't recognize. Fixed this by adding those flags only when the compiler isn't Clang.
2019-06-20 16:16:03 -07:00
if (COMPILER_IS_CLANG)
freebsd: clang requires -pthread In the now default case that THREADPOOL is enabled... not sure what OSX will make of that as previously it blew up with -pthread on clang cmdline at link time
2018-11-05 10:25:36 +08:00
osx clang quench deprecated api errors after approach by redhat https://bugzilla.redhat.com/show_bug.cgi?id=1155181 Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-29 19:19:09 +08:00
# otherwise osx blows a bunch of openssl deprecated api errors
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations" )
freebsd: clang requires -pthread In the now default case that THREADPOOL is enabled... not sure what OSX will make of that as previously it blew up with -pthread on clang cmdline at link time
2018-11-05 10:25:36 +08:00
if (UNIX AND LWS_HAVE_PTHREAD_H)
cmake: old osx clang: suppress check failures sue to -pthread only recognized at compile time
2020-01-27 16:23:39 +00:00
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -Wno-error=unused-command-line-argument" )
freebsd: clang requires -pthread In the now default case that THREADPOOL is enabled... not sure what OSX will make of that as previously it blew up with -pthread on clang cmdline at link time
2018-11-05 10:25:36 +08:00
endif()
osx clang quench deprecated api errors after approach by redhat https://bugzilla.redhat.com/show_bug.cgi?id=1155181 Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-29 19:19:09 +08:00
endif()
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
source_group("Headers Private" FILES ${HDR_PRIVATE})
source_group("Headers Public" FILES ${HDR_PUBLIC})
source_group("Sources" FILES ${SOURCES})
windows: add version resource
2018-02-05 15:33:36 +01:00
source_group("Resources" FILES ${RESOURCES})
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
#
# Create the lib.
#
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(LWS_LIBRARIES)
Fix shared library name for all platforms This is a further fix to f1b1254, building on 26fd0d2. Tidy up the LWS_WITH_SHARED and LWS_WITH_STATIC options.
2015-05-05 15:02:08 -05:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if (LWS_WITH_STATIC)
Added option to build the static library with PIC
2016-09-27 05:32:40 +08:00
if (LWS_STATIC_PIC)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
add_library(websockets STATIC
${HDR_PRIVATE}
${HDR_PUBLIC}
${SOURCES})
list(APPEND LWS_LIBRARIES websockets)
Fix shared library name for all platforms This is a further fix to f1b1254, building on 26fd0d2. Tidy up the LWS_WITH_SHARED and LWS_WITH_STATIC options.
2015-05-05 15:02:08 -05:00
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()
cmake: create build/include
2017-02-28 07:51:56 +08:00
add_custom_command(
TARGET websockets
libwebsockets.h: split out into a dir of sub-includes included by libwebsockets.h This has no effect on user code or backward compatibility. It moves the in-tree public api header libwebsockets.h from ./lib to ./include, and introduces a dir ./include/libwebsockets/ The single public api header is split out into 31 sub-headers in ./include/libwebsockets. ./include/libwebsockets.h contains some core types and platform adaptation code, but the rest of it is now 31 #include <libwebsockets/...> At install time, /usr/[local/]include/libwebsockets.h is installed as before, along now with the 31 sub-headers in ...include/libwebsockets/ There's no net effect on user code. But the api header is now much easier to maintain and study, with 31 topic-based sub headers.
2018-08-23 09:46:01 +08:00
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets.h
Subject: Fixed build in scope of a project (add_subdirectory)
2017-05-29 18:48:01 +03:00
${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
cmake: create build/include
2017-02-28 07:51:56 +08:00
)
cmake: copy include/libwebsockets into the build dir https://libwebsockets.org/pipermail/libwebsockets/2018-November/007745.html This allows user code to use the build dir ./include without having to do the make install, as a convenience.
2018-11-23 08:54:40 +08:00
add_custom_command(
TARGET websockets
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets/
${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets
)
cmake: create build/include
2017-02-28 07:51:56 +08:00
add_custom_command(
TARGET websockets
Subject: Fixed build in scope of a project (add_subdirectory)
2017-05-29 18:48:01 +03:00
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lws_config.h
${CMAKE_CURRENT_BINARY_DIR}/include/lws_config.h
cmake: create build/include
2017-02-28 07:51:56 +08:00
)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Fix shared library name for all platforms This is a further fix to f1b1254, building on 26fd0d2. Tidy up the LWS_WITH_SHARED and LWS_WITH_STATIC options.
2015-05-05 15:02:08 -05:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if (LWS_WITH_SHARED)
add_library(websockets_shared SHARED
${HDR_PRIVATE}
${HDR_PUBLIC}
windows: add version resource
2018-02-05 15:33:36 +01:00
${SOURCES}
${RESOURCES})
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
list(APPEND LWS_LIBRARIES websockets_shared)
Fixed soname and build shared lib for CMake. - Build a shared version of the library (used to be only static). - Set the so version name properly since the ABI has changed for version 1.2
2013-02-13 09:29:17 +08:00
Fix shared library name for all platforms This is a further fix to f1b1254, building on 26fd0d2. Tidy up the LWS_WITH_SHARED and LWS_WITH_STATIC options.
2015-05-05 15:02:08 -05:00
# We want the shared lib to be named "libwebsockets"
# not "libwebsocket_shared".
set_target_properties(websockets_shared
PROPERTIES
OUTPUT_NAME websockets)
if (WIN32)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
# Compile as DLL (export function declarations)
set_property(
TARGET websockets_shared
PROPERTY COMPILE_DEFINITIONS
LWS_DLL
LWS_INTERNAL)
endif()
Fix shared library name for all platforms This is a further fix to f1b1254, building on 26fd0d2. Tidy up the LWS_WITH_SHARED and LWS_WITH_STATIC options.
2015-05-05 15:02:08 -05:00
if (APPLE)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set_property(TARGET websockets_shared PROPERTY MACOSX_RPATH YES)
endif()
cmake: create build/include
2017-02-28 07:51:56 +08:00
add_custom_command(
TARGET websockets_shared
libwebsockets.h: split out into a dir of sub-includes included by libwebsockets.h This has no effect on user code or backward compatibility. It moves the in-tree public api header libwebsockets.h from ./lib to ./include, and introduces a dir ./include/libwebsockets/ The single public api header is split out into 31 sub-headers in ./include/libwebsockets. ./include/libwebsockets.h contains some core types and platform adaptation code, but the rest of it is now 31 #include <libwebsockets/...> At install time, /usr/[local/]include/libwebsockets.h is installed as before, along now with the 31 sub-headers in ...include/libwebsockets/ There's no net effect on user code. But the api header is now much easier to maintain and study, with 31 topic-based sub headers.
2018-08-23 09:46:01 +08:00
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets.h
Subject: Fixed build in scope of a project (add_subdirectory)
2017-05-29 18:48:01 +03:00
${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
cmake: create build/include
2017-02-28 07:51:56 +08:00
)
cmake: copy include/libwebsockets into the build dir https://libwebsockets.org/pipermail/libwebsockets/2018-November/007745.html This allows user code to use the build dir ./include without having to do the make install, as a convenience.
2018-11-23 08:54:40 +08:00
add_custom_command(
TARGET websockets
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/libwebsockets
${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets
)
cmake: create build/include
2017-02-28 07:51:56 +08:00
add_custom_command(
TARGET websockets_shared
Subject: Fixed build in scope of a project (add_subdirectory)
2017-05-29 18:48:01 +03:00
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lws_config.h
${CMAKE_CURRENT_BINARY_DIR}/include/lws_config.h
cmake: create build/include
2017-02-28 07:51:56 +08:00
)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Added so-version information to the lib.
2013-02-13 09:29:09 +08:00
# Set the so version of the lib.
update version 1.3 soname 4 Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-10 06:59:01 +08:00
# Equivalent to LDFLAGS=-version-info x:x:x
cmake: clang: Fix LWS_WITH_ASAN Building with LWS_WITH_ASAN was broken when using Clang, due to some flags being given that Clang doesn't recognize. Fixed this by adding those flags only when the compiler isn't Clang.
2019-06-20 16:16:03 -07:00
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
foreach(lib ${LWS_LIBRARIES})
set_target_properties(${lib}
Fixed DLL compilation on Windows for CMake. - Define LWS_DLL and LWS_INTERNAL when websockets_shared is compiled. - The websocket_shared target compiles to websocket.lib / websocket.dll (websocket.lib contains the exported functions for websocket.dll, and is the file that is linked to when a program wants to use the dll) - The websocket target compiles to websocket_static.lib on windows. - Replaced any "extern" with "LWS_EXTERN" on libwebsockets.h for proper DLL function exports. - Created a LIB_LIST with all the libwebsocket dependencies, instead of multiple calls to target_link_libraries, only one call is made for both the static and shared library version. This makes it easy to add other variants if wanted in the future. - Added ZLIB as a dependency for the libs, so that the build order will be correct at all times. - Added a dependency for the websockets lib to the test apps, so it is built before them. - Fixed the test-server-extpoll app to include the emulated_poll, and link to winsock on Windows. - Removed the global export of libwebsocket_internal_extensions, and added a function libwebsocket_get_internal_extensions() that returns it instead. Using the global would not work with the DLL export on Windows.
2013-02-13 09:29:26 +08:00
PROPERTIES
SOVERSION ${SOVERSION})
endforeach()
Added so-version information to the lib.
2013-02-13 09:29:09 +08:00
endif()
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
Fixed soname and build shared lib for CMake. - Build a shared version of the library (used to be only static). - Set the so version name properly since the ABI has changed for version 1.2
2013-02-13 09:29:17 +08:00
set(LIB_LIST)
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
#
# Find libraries.
#
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
#
http: compression methods Add generic http compression layer eanbled at cmake with LWS_WITH_HTTP_STREAM_COMPRESSION. This is wholly a feature of the HTTP role (used by h1 and h2 roles) and doesn't exist outside that context. Currently provides 'deflate' and 'br' compression methods for server side only. 'br' requires also -DLWS_WITH_HTTP_BROTLI=1 at cmake and the brotli libraries (available in your distro already) and dev package. Other compression methods can be added nicely using an ops struct. The built-in file serving stuff will use this is the client says he can handle it, and the mimetype of the file either starts with "text/" (html and css etc) or is the mimetype of Javascript. zlib allocates quite a bit while in use, it seems to be around 256KiB per stream. So this is only useful on relatively strong servers with lots of memory. However for some usecases where you are serving a lot of css and js assets, it's a nice help. The patch performs special treatment for http/1.1 pipelining, since the compression is performed on the fly the compressed content-length is not known until the end. So for h1 only, chunked transfer-encoding is automatically added so pipelining can continue of the connection. For h2 the chunking is neither supported nor required, so it "just works". User code can also request to add a compression transform before the reply headers were sent using the new api LWS_VISIBLE int lws_http_compression_apply(struct lws *wsi, const char *name, unsigned char **p, unsigned char *end, char decomp); ... this allows transparent compression of dynamically generated HTTP. The requested compression (eg, "deflate") is only applied if the client headers indicated it was supported, otherwise it's a NOP. Name may be NULL in which case the first compression method in the internal table at stream.c that is mentioned as acceptable by the client will be used. NOTE: the compression translation, same as h2 support, relies on the user code using LWS_WRITE_HTTP and then LWS_WRITE_HTTP_FINAL on the last part written. The internal lws fileserving code already does this.
2018-09-02 14:43:05 +08:00
# ZLIB (needed for deflate extension and if LWS_WITH_HTTP_STREAM_COMPRESSION)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
#
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if (LWS_WITH_ZLIB)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_BUNDLED_ZLIB)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
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}/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()
else()
message(FATAL_ERROR "Don't have bundled zlib for that platform")
endif()
elseif (NOT ZLIB_FOUND)
cmake: miniz: add as option
2019-07-03 19:46:23 +01:00
if (LWS_WITH_MINIZ)
find_package(Miniz REQUIRED)
set(ZLIB_INCLUDE_DIRS ${MINIZ_INCLUDE_DIRS})
set(ZLIB_LIBRARIES ${MINIZ_LIBRARIES})
else()
find_package(ZLIB REQUIRED)
endif()
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
endif()
cmake: miniz: add as option
2019-07-03 19:46:23 +01:00
message("zlib/miniz include dirs: ${ZLIB_INCLUDE_DIRS}")
message("zlib/miniz libraries: ${ZLIB_LIBRARIES}")
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
include_directories(${ZLIB_INCLUDE_DIRS})
cmake: make sure libz is at end of link if enabled https://github.com/warmcat/libwebsockets/issues/1840
2020-02-17 19:10:52 +00:00
# done later at end of link list
# list(APPEND LIB_LIST ${ZLIB_LIBRARIES})
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
http: compression methods Add generic http compression layer eanbled at cmake with LWS_WITH_HTTP_STREAM_COMPRESSION. This is wholly a feature of the HTTP role (used by h1 and h2 roles) and doesn't exist outside that context. Currently provides 'deflate' and 'br' compression methods for server side only. 'br' requires also -DLWS_WITH_HTTP_BROTLI=1 at cmake and the brotli libraries (available in your distro already) and dev package. Other compression methods can be added nicely using an ops struct. The built-in file serving stuff will use this is the client says he can handle it, and the mimetype of the file either starts with "text/" (html and css etc) or is the mimetype of Javascript. zlib allocates quite a bit while in use, it seems to be around 256KiB per stream. So this is only useful on relatively strong servers with lots of memory. However for some usecases where you are serving a lot of css and js assets, it's a nice help. The patch performs special treatment for http/1.1 pipelining, since the compression is performed on the fly the compressed content-length is not known until the end. So for h1 only, chunked transfer-encoding is automatically added so pipelining can continue of the connection. For h2 the chunking is neither supported nor required, so it "just works". User code can also request to add a compression transform before the reply headers were sent using the new api LWS_VISIBLE int lws_http_compression_apply(struct lws *wsi, const char *name, unsigned char **p, unsigned char *end, char decomp); ... this allows transparent compression of dynamically generated HTTP. The requested compression (eg, "deflate") is only applied if the client headers indicated it was supported, otherwise it's a NOP. Name may be NULL in which case the first compression method in the internal table at stream.c that is mentioned as acceptable by the client will be used. NOTE: the compression translation, same as h2 support, relies on the user code using LWS_WRITE_HTTP and then LWS_WRITE_HTTP_FINAL on the last part written. The internal lws fileserving code already does this.
2018-09-02 14:43:05 +08:00
if (LWS_WITH_HTTP_BROTLI)
list(APPEND LIB_LIST brotlienc brotlidec brotlidec)
endif()
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
#
# OpenSSL
#
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_WITH_SSL)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
message("Compiling with SSL support")
mbedtls and polarssl first part polarssl is the old name for mbedtls. Unfortunately the two are confused in eg, Fedora. For our purposes, polarssl or mbedtls < 2.0 has includes in /usr/include/polarssl and polarssl_ apis and we call that "polarssl". polarssl or mbedtls >=2.0 has includes in /usr/include/mbedtls and mbedtls_ apis, we call that "mbedtls". This has to be spelled out clearly because eg Fedora has a package "mbedtls" which is 1.3.x and has the polarssl_ apis and include path. We will deal with that as "polarssl" despite the package name then. This patch lets you use LWS_USE_POLARSSL or LWS_USE_MBEDTLS and set the include and library path like this cmake .. -DLWS_USE_POLARSSL=1 -DLWS_POLARSSL_INCLUDE_DIRS=/usr/include -DLWS_POLARSSL_LIBRARIES=/usr/lib64/libmbedtls.so.9 This patch adds the cmake support and adapts [private-]libwebsockets.h but doesn't modify the apis in ssl[-*].c yet. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 19:58:02 +08:00
set(chose_ssl 0)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_WOLFSSL)
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
# Use wolfSSL as OpenSSL replacement.
Cleaned up the CyaSSL linking in the CMake project a bit. Separated the CyaSSL linking and OpenSSL linking for more clearity. Now tested on both OSX and Windows as well.
2013-02-06 15:30:56 +09:00
# TODO: Add a find_package command for this also.
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
message("wolfSSL include dir: ${WOLFSSL_INCLUDE_DIRS}")
message("wolfSSL libraries: ${WOLFSSL_LIBRARIES}")
Cleaned up the CyaSSL linking in the CMake project a bit. Separated the CyaSSL linking and OpenSSL linking for more clearity. Now tested on both OSX and Windows as well.
2013-02-06 15:30:56 +09:00
Added build instructions for CMake. Also changed it so that specifying the include directories for CyaSSL is nicer.
2013-02-07 20:24:19 +08:00
# Additional to the root directory we need to include
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
# the wolfssl/ subdirectory which contains the OpenSSL
Fix some minor typos.
2015-12-03 15:55:11 +02:00
# compatibility layer headers.
Fix some typographical and grammatical errors
2015-10-01 12:25:05 +03:00
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_CYASSL)
Allow using CyaSSL in stead of wolfSSL
2015-08-09 22:56:32 +02:00
foreach(inc ${WOLFSSL_INCLUDE_DIRS})
include_directories("${inc}" "${inc}/cyassl")
endforeach()
else()
foreach(inc ${WOLFSSL_INCLUDE_DIRS})
include_directories("${inc}" "${inc}/wolfssl")
endforeach()
endif()
Added build instructions for CMake. Also changed it so that specifying the include directories for CyaSSL is nicer.
2013-02-07 20:24:19 +08:00
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
list(APPEND LIB_LIST "${WOLFSSL_LIBRARIES}")
mbedtls and polarssl first part polarssl is the old name for mbedtls. Unfortunately the two are confused in eg, Fedora. For our purposes, polarssl or mbedtls < 2.0 has includes in /usr/include/polarssl and polarssl_ apis and we call that "polarssl". polarssl or mbedtls >=2.0 has includes in /usr/include/mbedtls and mbedtls_ apis, we call that "mbedtls". This has to be spelled out clearly because eg Fedora has a package "mbedtls" which is 1.3.x and has the polarssl_ apis and include path. We will deal with that as "polarssl" despite the package name then. This patch lets you use LWS_USE_POLARSSL or LWS_USE_MBEDTLS and set the include and library path like this cmake .. -DLWS_USE_POLARSSL=1 -DLWS_POLARSSL_INCLUDE_DIRS=/usr/include -DLWS_POLARSSL_LIBRARIES=/usr/lib64/libmbedtls.so.9 This patch adds the cmake support and adapts [private-]libwebsockets.h but doesn't modify the apis in ssl[-*].c yet. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 19:58:02 +08:00
set(chose_ssl 1)
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_MBEDTLS)
mbedtls: Add mbedTLS support to CMakeLists.txt
2017-08-28 20:12:32 +08:00
message("MBEDTLS include dir: ${MBEDTLS_INCLUDE_DIRS}")
message("MBEDTLS libraries: ${MBEDTLS_LIBRARIES}")
foreach(inc ${MBEDTLS_INCLUDE_DIRS})
include_directories("${inc}" "${inc}/mbedtls")
endforeach()
list(APPEND LIB_LIST "${MBEDTLS_LIBRARIES}")
set(chose_ssl 1)
endif()
mbedtls and polarssl first part polarssl is the old name for mbedtls. Unfortunately the two are confused in eg, Fedora. For our purposes, polarssl or mbedtls < 2.0 has includes in /usr/include/polarssl and polarssl_ apis and we call that "polarssl". polarssl or mbedtls >=2.0 has includes in /usr/include/mbedtls and mbedtls_ apis, we call that "mbedtls". This has to be spelled out clearly because eg Fedora has a package "mbedtls" which is 1.3.x and has the polarssl_ apis and include path. We will deal with that as "polarssl" despite the package name then. This patch lets you use LWS_USE_POLARSSL or LWS_USE_MBEDTLS and set the include and library path like this cmake .. -DLWS_USE_POLARSSL=1 -DLWS_POLARSSL_INCLUDE_DIRS=/usr/include -DLWS_POLARSSL_LIBRARIES=/usr/lib64/libmbedtls.so.9 This patch adds the cmake support and adapts [private-]libwebsockets.h but doesn't modify the apis in ssl[-*].c yet. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 19:58:02 +08:00
if (NOT chose_ssl)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
# TODO: Add support for STATIC also.
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
if (NOT LWS_WITH_ESP32)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
find_package(OpenSSL REQUIRED)
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
endif()
message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIRS}")
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
if (NOT LWS_WITH_ESP32)
message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
endif()
Some more Cmake stuff.
2013-02-06 15:25:26 +09:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
include_directories("${OPENSSL_INCLUDE_DIRS}")
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
if (NOT LWS_WITH_ESP32)
list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
endif()
ssl ecdh adapt if missing ecdh.h include https://github.com/warmcat/libwebsockets/issues/457
2016-03-12 08:37:36 +08:00
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (NOT LWS_WITH_MBEDTLS)
mbedtls: isgnore ECDH_H existence and try to find mbedtls libs + includes by default
2017-08-28 21:00:11 +08:00
# older (0.98) Openssl lacks this
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
check_include_file(openssl/ecdh.h LWS_HAVE_OPENSSL_ECDH_H)
ssl ecdh adapt if missing ecdh.h include https://github.com/warmcat/libwebsockets/issues/457
2016-03-12 08:37:36 +08:00
mbedtls: isgnore ECDH_H existence and try to find mbedtls libs + includes by default
2017-08-28 21:00:11 +08:00
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()
lws-genhash This gives you a thin api on top of your TLS library digest functions which abstracts away whether you are using mbedtls apis or openssl ones. Using lws_genhash... apis the same code works either way and the dependencies on which TLS lib is hidden.
2017-09-10 14:44:12 +08:00
else()
unset(LWS_HAVE_OPENSSL_ECDH_H)
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
endif(NOT LWS_WITH_MBEDTLS)
non-openssl: only check for openssl ecdh in openssl builds See also https://github.com/warmcat/libwebsockets/issues/559 Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-06-06 15:03:09 +00:00
endif()
ssl ecdh adapt if missing ecdh.h include https://github.com/warmcat/libwebsockets/issues/457
2016-03-12 08:37:36 +08:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
endif(LWS_WITH_SSL)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
libev port merged by andy@warmcat.com via https://github.com/gaby64/libwebsockets-libev To use, you need to both - cmake ---> -DLWS_USE_LIBEV=1 - info->options must have LWS_SERVER_OPTION_LIBEV set when creating the context this is so a single library can be built for distros to support apps that use normal polling and apps that use libev polling.
2014-03-23 13:25:07 +08:00
if (LWS_WITH_LIBEV)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
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()
endif()
message("libev include dir: ${LIBEV_INCLUDE_DIRS}")
message("libev libraries: ${LIBEV_LIBRARIES}")
include_directories("${LIBEV_INCLUDE_DIRS}")
list(APPEND LIB_LIST ${LIBEV_LIBRARIES})
libev port merged by andy@warmcat.com via https://github.com/gaby64/libwebsockets-libev To use, you need to both - cmake ---> -DLWS_USE_LIBEV=1 - info->options must have LWS_SERVER_OPTION_LIBEV set when creating the context this is so a single library can be built for distros to support apps that use normal polling and apps that use libev polling.
2014-03-23 13:25:07 +08:00
endif(LWS_WITH_LIBEV)
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
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()
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()
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
Subject: Libevent: Initial Support * Added libevent support functionality into lib/libevent.c * Added test-server-libevent for testing
2017-03-15 19:41:11 +05:30
if (LWS_WITH_LIBEVENT)
if (NOT LIBEVENT_FOUND)
find_path(LIBEVENT_INCLUDE_DIRS NAMES event2/event.h)
find_library(LIBEVENT_LIBRARIES NAMES event)
if(LIBEVENT_INCLUDE_DIRS AND LIBEVENT_LIBRARIES)
set(LIBEVENT_FOUND 1)
endif()
endif()
message("libevent include dir: ${LIBEVENT_INCLUDE_DIRS}")
message("libevent libraries: ${LIBEVENT_LIBRARIES}")
include_directories("${LIBEVENT_INCLUDE_DIRS}")
list(APPEND LIB_LIST ${LIBEVENT_LIBRARIES})
endif(LWS_WITH_LIBEVENT)
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
if (LWS_WITH_SQLITE3)
if (NOT SQLITE3_FOUND)
find_path(SQLITE3_INCLUDE_DIRS NAMES sqlite3.h)
find_library(SQLITE3_LIBRARIES NAMES sqlite3)
if(SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES)
set(SQLITE3_FOUND 1)
endif()
endif()
message("sqlite3 include dir: ${SQLITE3_INCLUDE_DIRS}")
message("sqlite3 libraries: ${SQLITE3_LIBRARIES}")
include_directories("${SQLITE3_INCLUDE_DIRS}")
list(APPEND LIB_LIST ${SQLITE3_LIBRARIES})
endif()
http proxy: client: unix socket support This allows the client stuff to understand that addresses beginning with '+' represent unix sockets. If the first character after the '+' is '@', it understands that the '@' should be read as '\0', in order to use Linux "abstract namespace" sockets. Further the lws_parse_uri() helper is extended to understand the convention that an address starting with + is a unix socket, and treats the socket path as delimited by ':', eg http://+/var/run/mysocket:/my/path HTTP Proxy is updated to allow mounts to these unix socket paths. Proxy connections go out on h1, but are dynamically translated to h1 or h2 on the incoming side. Proxy usage of libhubbub is separated out... LWS_WITH_HTTP_PROXY is on by default, and LWS_WITH_HUBBUB is off by default.
2018-09-04 08:06:46 +08:00
if (LWS_WITH_HUBBUB)
Correct the library name of LIBHUBBUB_LIBRARIES It should be `hubbub` in `find_library` to make the function work.
2016-10-10 20:10:34 +08:00
find_library(LIBHUBBUB_LIBRARIES NAMES hubbub)
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
list(APPEND LIB_LIST ${LIBHUBBUB_LIBRARIES} )
endif()
role: dbus This adds support for the integrating libdbus into the lws event loop. Unlike the other roles, lws doesn't completely adopt the fd and libdbus insists to retain control over the fd lifecycle. However libdbus provides apis for foreign code (lws) to provide event loop services to libdbus for the fd. Accordingly, unlike the other roles rx and writeable are not subsumed into lws callback messages and the events remain the property of libdbus. A context struct wrapper is provided that is available in the libdbus callbacks to bridge between the lws and dbus worlds, along with a minimal example dbus client and server.
2018-10-02 10:50:24 +08:00
if (LWS_ROLE_DBUS)
message("dbus include dir 1: ${LWS_DBUS_INCLUDE1}")
message("dbus include dir 2: ${LWS_DBUS_INCLUDE2}")
include_directories("${LWS_DBUS_INCLUDE1}")
include_directories("${LWS_DBUS_INCLUDE2}")
list(APPEND LIB_LIST ${LWS_DBUS_LIB})
endif()
libuv integration This gets the libuv stuff plumbed in and working. Currently it's only workable for some service thread, and there is an isolated valgrind problem left ==28425== 128 bytes in 1 blocks are definitely lost in loss record 3 of 3 ==28425== at 0x4C28C50: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x4C2AB1E: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==28425== by 0x58BBB27: maybe_resize (core.c:748) ==28425== by 0x58BBB27: uv__io_start (core.c:787) ==28425== by 0x58C1B80: uv__signal_loop_once_init (signal.c:225) ==28425== by 0x58C1B80: uv_signal_init (signal.c:260) ==28425== by 0x58BF7A6: uv_loop_init (loop.c:66) ==28425== by 0x4157F5: lws_uv_initloop (libuv.c:89) ==28425== by 0x405536: main (test-server-libuv.c:284) libuv wants to sign off on all libuv 'handles' that will close, and callback to do the close confirmation asynchronously. The wsi close function is adapted when libuv is in use to work with libuv accordingly and exit the uv loop the number of remaining wsi is zero. Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-14 09:27:41 +08:00
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
#
# Platform specific libs.
#
Enable compilation on Windows CE Add a few ifdefs to support this additional platform.
2014-02-28 01:31:39 +01:00
if (WINCE)
list(APPEND LIB_LIST ws2.lib)
elseif (WIN32)
windows: changes to build with VS2015
2017-02-14 11:17:09 -08:00
list(APPEND LIB_LIST ws2_32.lib userenv.lib psapi.lib iphlpapi.lib)
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
endif()
qnx: add support https://libwebsockets.org/pipermail/libwebsockets/2018-January/003600.html
2018-01-04 10:37:25 +08:00
if (${CMAKE_SYSTEM_NAME} MATCHES "QNX")
list(APPEND LIB_LIST socket)
endif()
cmake: make sure libz is at end of link if enabled https://github.com/warmcat/libwebsockets/issues/1840
2020-02-17 19:10:52 +00:00
#
# add libs here that need to be at the end of the link order
#
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
if (UNIX)
Fixed soname and build shared lib for CMake. - Build a shared version of the library (used to be only static). - Set the so version name properly since the ABI has changed for version 1.2
2013-02-13 09:29:17 +08:00
list(APPEND LIB_LIST m)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
endif()
Started redoing CMake support based on the up to date repos
2013-02-01 14:52:53 +01:00
Subject: Build on SmartOS
2019-08-11 23:57:27 +00:00
if(SMARTOS)
list(APPEND LIB_LIST socket)
endif()
Subject: Haiku: initial platform support https://github.com/warmcat/libwebsockets/pull/1033
2017-09-24 15:30:42 +00:00
if (HAIKU)
list(APPEND LIB_LIST network)
endif()
capabilities support
2017-06-07 06:10:02 +08:00
if (LWS_HAVE_LIBCAP)
list(APPEND LIB_LIST cap )
endif()
openssl: make sure tests have -ldl v2 https://github.com/warmcat/libwebsockets/issues/1662
2020-01-17 12:35:27 +00:00
if (UNIX)
list(APPEND LIB_LIST dl)
endif()
cmake: make sure libz is at end of link if enabled https://github.com/warmcat/libwebsockets/issues/1840
2020-02-17 19:10:52 +00:00
if (LWS_WITH_ZLIB AND NOT LWS_WITH_BUNDLED_ZLIB)
list(APPEND LIB_LIST "${ZLIB_LIBRARIES}")
endif()
openssl: make sure tests have -ldl v2 https://github.com/warmcat/libwebsockets/issues/1662
2020-01-17 12:35:27 +00:00
Fixed DLL compilation on Windows for CMake. - Define LWS_DLL and LWS_INTERNAL when websockets_shared is compiled. - The websocket_shared target compiles to websocket.lib / websocket.dll (websocket.lib contains the exported functions for websocket.dll, and is the file that is linked to when a program wants to use the dll) - The websocket target compiles to websocket_static.lib on windows. - Replaced any "extern" with "LWS_EXTERN" on libwebsockets.h for proper DLL function exports. - Created a LIB_LIST with all the libwebsocket dependencies, instead of multiple calls to target_link_libraries, only one call is made for both the static and shared library version. This makes it easy to add other variants if wanted in the future. - Added ZLIB as a dependency for the libs, so that the build order will be correct at all times. - Added a dependency for the websockets lib to the test apps, so it is built before them. - Fixed the test-server-extpoll app to include the emulated_poll, and link to winsock on Windows. - Removed the global export of libwebsocket_internal_extensions, and added a function libwebsocket_get_internal_extensions() that returns it instead. Using the global would not work with the DLL export on Windows.
2013-02-13 09:29:26 +08:00
# Setup the linking for all libs.
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
foreach (lib ${LWS_LIBRARIES})
Fixed DLL compilation on Windows for CMake. - Define LWS_DLL and LWS_INTERNAL when websockets_shared is compiled. - The websocket_shared target compiles to websocket.lib / websocket.dll (websocket.lib contains the exported functions for websocket.dll, and is the file that is linked to when a program wants to use the dll) - The websocket target compiles to websocket_static.lib on windows. - Replaced any "extern" with "LWS_EXTERN" on libwebsockets.h for proper DLL function exports. - Created a LIB_LIST with all the libwebsocket dependencies, instead of multiple calls to target_link_libraries, only one call is made for both the static and shared library version. This makes it easy to add other variants if wanted in the future. - Added ZLIB as a dependency for the libs, so that the build order will be correct at all times. - Added a dependency for the websockets lib to the test apps, so it is built before them. - Fixed the test-server-extpoll app to include the emulated_poll, and link to winsock on Windows. - Removed the global export of libwebsocket_internal_extensions, and added a function libwebsocket_get_internal_extensions() that returns it instead. Using the global would not work with the DLL export on Windows.
2013-02-13 09:29:26 +08:00
target_link_libraries(${lib} ${LIB_LIST})
endforeach()
Fixed soname and build shared lib for CMake. - Build a shared version of the library (used to be only static). - Set the so version name properly since the ABI has changed for version 1.2
2013-02-13 09:29:17 +08:00
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
set (temp ${CMAKE_REQUIRED_LIBRARIES})
set(CMAKE_REQUIRED_LIBRARIES ${LIB_LIST})
windows: CHECK_FUNCTION_EXISTS workaround
2017-11-08 15:53:43 +08:00
if (LWS_WITH_ZLIB)
if (LWS_WITH_BUNDLED_ZLIB)
if (WIN32)
# it's trying to delete internal zlib entry
LIST(REMOVE_AT CMAKE_REQUIRED_LIBRARIES 0 )
endif()
endif()
endif()
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
CHECK_FUNCTION_EXISTS(SSL_CTX_set1_param LWS_HAVE_SSL_CTX_set1_param)
support openssl info callback https://github.com/warmcat/libwebsockets/issues/936
2017-06-20 11:46:49 +08:00
CHECK_FUNCTION_EXISTS(SSL_set_info_callback LWS_HAVE_SSL_SET_INFO_CALLBACK)
client confirm server hostname in cert Openssl v1.0.2 and above have support for checking the hostname the client side connected to against the hostname on the cert the server presented. This enables that feature if the necessary API is available in the openssl version, meaning the connection will fail at ssl negotiation if the cert isn't for the requested server It's very easy to test, add a fake entry to /etc/hosts for the server IP with a different name, using that will fail at ssl but using the correct dns name matching the certificate will work.
2016-06-28 19:50:40 +08:00
CHECK_FUNCTION_EXISTS(X509_VERIFY_PARAM_set1_host LWS_HAVE_X509_VERIFY_PARAM_set1_host)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
CHECK_FUNCTION_EXISTS(RSA_set0_key LWS_HAVE_RSA_SET0_KEY)
tls: add x509 query api This adds a single api on lws that allows querying elements from the peer certificate on a connection. The api works the same regardless of the TLS backend.
2017-10-26 09:54:25 +08:00
CHECK_FUNCTION_EXISTS(X509_get_key_usage LWS_HAVE_X509_get_key_usage)
boringssl: deal with loss of EVP_PKEY_new_mac_key Rewrite HMAC stuff to use HMAC_ apis instead of EVP Bit trickly since modern OpenSSL has opaque HMAC_CTX and older OpenSSL does not have any apis to allocate and free it. Add another cmake check for the allocation api to decide what to do.
2019-07-09 17:44:49 +01:00
CHECK_FUNCTION_EXISTS(EVP_PKEY_new_raw_private_key LWS_HAVE_SSL_CTX_EVP_PKEY_new_raw_private_key)
tls: add x509 query api This adds a single api on lws that allows querying elements from the peer certificate on a connection. The api works the same regardless of the TLS backend.
2017-10-26 09:54:25 +08:00
CHECK_FUNCTION_EXISTS(SSL_CTX_get0_certificate LWS_HAVE_SSL_CTX_get0_certificate)
client: add alpn processing on mbedtls and openssl This just supports "http/1.1" alpn and lets the client know it can use keepalive earlier if it affirmitively negotiated "http/1.1" on alpn. mbedTLS wrapper needed a small adaptation to also allow per-client-ssl control of the alpn negotiation list.
2018-03-27 06:29:49 +08:00
CHECK_FUNCTION_EXISTS(SSL_get0_alpn_selected LWS_HAVE_SSL_get0_alpn_selected)
CHECK_FUNCTION_EXISTS(SSL_set_alpn_protos LWS_HAVE_SSL_set_alpn_protos)
boringssl: adapt to missing AES modes
2019-07-09 18:11:16 +01:00
CHECK_FUNCTION_EXISTS(EVP_aes_128_cfb8 LWS_HAVE_EVP_aes_128_cfb8)
CHECK_FUNCTION_EXISTS(EVP_aes_128_cfb128 LWS_HAVE_EVP_aes_128_cfb128)
CHECK_FUNCTION_EXISTS(EVP_aes_192_cfb8 LWS_HAVE_EVP_aes_192_cfb8)
CHECK_FUNCTION_EXISTS(EVP_aes_192_cfb128 LWS_HAVE_EVP_aes_192_cfb128)
CHECK_FUNCTION_EXISTS(EVP_aes_256_cfb8 LWS_HAVE_EVP_aes_256_cfb8)
CHECK_FUNCTION_EXISTS(EVP_aes_256_cfb128 LWS_HAVE_EVP_aes_256_cfb128)
CHECK_FUNCTION_EXISTS(EVP_aes_128_xts LWS_HAVE_EVP_aes_128_xts)
boringssl: deal with loss of EVP_PKEY_new_mac_key Rewrite HMAC stuff to use HMAC_ apis instead of EVP Bit trickly since modern OpenSSL has opaque HMAC_CTX and older OpenSSL does not have any apis to allocate and free it. Add another cmake check for the allocation api to decide what to do.
2019-07-09 17:44:49 +01:00
CHECK_FUNCTION_EXISTS(RSA_verify_pss_mgf1 LWS_HAVE_RSA_verify_pss_mgf1)
CHECK_FUNCTION_EXISTS(HMAC_CTX_new LWS_HAVE_HMAC_CTX_new)
openssl tls1.3: allow setting ciphersuites at context creation time https://github.com/warmcat/libwebsockets/issues/1440
2018-10-27 08:05:21 +08:00
CHECK_FUNCTION_EXISTS(SSL_CTX_set_ciphersuites LWS_HAVE_SSL_CTX_set_ciphersuites)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
if (LWS_WITH_SSL AND NOT LWS_WITH_MBEDTLS)
openssl: need ldl to detect apis when no openssl .so bringing it in test apps also accordingly need building with -ldl
2019-05-27 18:52:28 +08:00
if (UNIX)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dl)
endif()
openssl3: improve api availability tests https://github.com/warmcat/libwebsockets/issues/1562
2019-04-30 08:13:32 +01:00
CHECK_C_SOURCE_COMPILES("#include <openssl/ssl.h>\nint main(void) { STACK_OF(X509) *c = NULL; SSL_CTX *ctx = NULL; return (int)SSL_CTX_get_extra_chain_certs_only(ctx, &c); }\n" LWS_HAVE_SSL_EXTRA_CHAIN_CERTS)
CHECK_C_SOURCE_COMPILES("#include <openssl/ssl.h>\nint main(void) { EVP_MD_CTX *md_ctx = NULL; EVP_MD_CTX_free(md_ctx); return 0; }\n" LWS_HAVE_EVP_MD_CTX_free)
jwe
2018-12-13 20:05:12 +08:00
CHECK_FUNCTION_EXISTS(ECDSA_SIG_set0 LWS_HAVE_ECDSA_SIG_set0)
CHECK_FUNCTION_EXISTS(BN_bn2binpad LWS_HAVE_BN_bn2binpad)
CHECK_FUNCTION_EXISTS(EVP_aes_128_wrap LWS_HAVE_EVP_aes_128_wrap)
openssl3: handle EC_POINT_get_affine_coordinates api change
2019-03-20 19:24:29 +08:00
CHECK_FUNCTION_EXISTS(EC_POINT_get_affine_coordinates LWS_HAVE_EC_POINT_get_affine_coordinates)
tls: split out common, openssl and mbedtls code - introduce lib/tls/mbedtls lib/tls/openssl - move wrapper into lib/tls/mbedtls/wrapper - introduce private helpers to hide backend This patch doesn't replace or remove the wrapper, it moves it to lib/tls/mbedtls/wrapper. But it should be now that the ONLY functions directly consuming wrapper apis are isolated in - lib/tls/mbedtls/client.c (180 lines) - lib/tls/mbedtls/server.c (317 lines) - lib/tls/mbedtls/ssl.c (325 lines) In particular there are no uses of openssl or mbedtls-related constants outside of ./lib/tls any more.
2017-10-18 09:41:44 +08:00
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_MBEDTLS)
esp32: workaround cant find TLS_client_method
2017-04-07 11:29:57 +08:00
set(LWS_HAVE_TLS_CLIENT_METHOD 1)
mbedtls: find LWS_HAVE_X509_VERIFY_PARAM_set1_host in CMake
2017-09-09 08:31:49 +08:00
if (NOT LWS_WITH_ESP32)
# not supported in esp-idf openssl wrapper yet, but is in our version
set(LWS_HAVE_X509_VERIFY_PARAM_set1_host 1)
endif()
mbedtls: finer-grained enable checks and OP-TEE
2019-01-11 13:14:32 +08:00
CHECK_FUNCTION_EXISTS(mbedtls_ssl_conf_alpn_protocols LWS_HAVE_mbedtls_ssl_conf_alpn_protocols)
CHECK_FUNCTION_EXISTS(mbedtls_ssl_get_alpn_protocol LWS_HAVE_mbedtls_ssl_get_alpn_protocol)
CHECK_FUNCTION_EXISTS(mbedtls_ssl_conf_sni LWS_HAVE_mbedtls_ssl_conf_sni)
CHECK_FUNCTION_EXISTS(mbedtls_ssl_set_hs_ca_chain LWS_HAVE_mbedtls_ssl_set_hs_ca_chain)
CHECK_FUNCTION_EXISTS(mbedtls_ssl_set_hs_own_cert LWS_HAVE_mbedtls_ssl_set_hs_own_cert)
CHECK_FUNCTION_EXISTS(mbedtls_ssl_set_hs_authmode LWS_HAVE_mbedtls_ssl_set_hs_authmode)
CHECK_FUNCTION_EXISTS(mbedtls_net_init LWS_HAVE_mbedtls_net_init)
esp32: workaround cant find TLS_client_method
2017-04-07 11:29:57 +08:00
else()
Subject: ssl: fix OpenSSL client method detection
2017-04-06 15:46:37 +02:00
CHECK_FUNCTION_EXISTS(TLS_client_method LWS_HAVE_TLS_CLIENT_METHOD)
CHECK_FUNCTION_EXISTS(TLSv1_2_client_method LWS_HAVE_TLSV1_2_CLIENT_METHOD)
esp32: workaround cant find TLS_client_method
2017-04-07 11:29:57 +08:00
endif()
pipe2 where possible
2018-04-12 21:37:59 +08:00
# ideally we want to use pipe2()
CHECK_C_SOURCE_COMPILES("#define _GNU_SOURCE\n#include <unistd.h>\nint main(void) {int fd[2];\n return pipe2(fd, 0);\n}\n" LWS_HAVE_PIPE2)
tcp keepalive: user TCP_USER_TIMEOUT on linux if extant https://github.com/warmcat/libwebsockets/issues/1223
2018-04-18 18:45:27 +08:00
# tcp keepalive needs this on linux to work practically... but it only exists
# after kernel 2.6.37
cmake: align include used for LWS_HAVE_TCP_USER_TIMEOUT
2018-05-15 08:04:48 +08:00
CHECK_C_SOURCE_COMPILES("#include <netinet/tcp.h>\nint main(void) { return TCP_USER_TIMEOUT; }\n" LWS_HAVE_TCP_USER_TIMEOUT)
tcp keepalive: user TCP_USER_TIMEOUT on linux if extant https://github.com/warmcat/libwebsockets/issues/1223
2018-04-18 18:45:27 +08:00
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
set(CMAKE_REQUIRED_LIBRARIES ${temp})
# Generate the lws_config.h that includes all the public compilation settings.
configure_file(
clean up top level of project
2017-09-22 09:46:58 +08:00
"${PROJECT_SOURCE_DIR}/cmake/lws_config.h.in"
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
"${PROJECT_BINARY_DIR}/lws_config.h")
# Generate the lws_config.h that includes all the private compilation settings.
configure_file(
clean up top level of project
2017-09-22 09:46:58 +08:00
"${PROJECT_SOURCE_DIR}/cmake/lws_config_private.h.in"
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
"${PROJECT_BINARY_DIR}/lws_config_private.h")
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
# Generate self-signed SSL certs for the test-server.
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL)
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
message("Searching for OpenSSL executable and dlls")
find_package(OpenSSLbins)
message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
if (OPENSSL_EXECUTABLE MATCHES "^$")
set(OPENSSL_EXECUTABLE openssl)
endif()
if (NOT OPENSSL_EXECUTABLE)
set(OPENSSL_EXECUTABLE openssl)
endif()
endif()
set(GENCERTS 0)
cmake: only generate test cert when SERVER and TESTAPPS enabled apart from LWS_WITHOUT_TEST_SERVER the test server will also not be built if LWS_WITHOUT_TESTAPPS or LWS_WITHOUT_SERVER is defined, we update the CMake configuration to skip cert generation and installation in those cases. Signed-off-by: Adam Wolk <adam.wolk@koparo.com>
2017-11-25 20:15:29 +01:00
if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER AND NOT LWS_WITHOUT_SERVER AND NOT LWS_WITHOUT_TESTAPPS)
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
set(GENCERTS 1)
endif()
if (LWS_WITH_ESP32)
set(GENCERTS 1)
endif()
message(" GENCERTS = ${GENCERTS}")
if (GENCERTS)
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
esp32: multi ap slots plus PEM certs and parallel build fixes
2017-05-11 15:02:01 +08:00
# OUTPUT_QUIET ERROR_QUIET
)
esp32: align fops member name defines
2017-03-08 11:11:41 +08:00
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 testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
#
# Test applications
#
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
set(TEST_APP_LIST)
refactor: most preparation for -DLWS_ROLE_H1=0
2018-04-27 19:16:50 +08:00
if ((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_TESTAPPS)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
#
# Helper function for adding a test app.
#
test server add lws_status Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-20 14:05:55 +08:00
macro(create_test_app TEST_NAME MAIN_SRC S2 S3 S4 S5 S6)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
set(TEST_SRCS ${MAIN_SRC})
set(TEST_HDR)
refactor test server Split test-server into four C files and a header Signed-off-by: Andy Green <andy.green@linaro.org>
2015-11-19 13:55:47 +08:00
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()
extension permessage deflate Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-11 11:34:01 +08:00
if ("${S5}" STREQUAL "")
else()
list(APPEND TEST_SRCS ${S5})
endif()
test server add lws_status Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-20 14:05:55 +08:00
if ("${S6}" STREQUAL "")
else()
list(APPEND TEST_SRCS ${S6})
endif()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
if (WIN32)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
list(APPEND TEST_SRCS
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
${WIN32_HELPERS_PATH}/getopt.c
${WIN32_HELPERS_PATH}/getopt_long.c
${WIN32_HELPERS_PATH}/gettimeofday.c
Remove websock-w32.h
2014-03-29 08:25:58 +01:00
)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
list(APPEND TEST_HDR
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
${WIN32_HELPERS_PATH}/getopt.h
${WIN32_HELPERS_PATH}/gettimeofday.h
Remove websock-w32.h
2014-03-29 08:25:58 +01:00
)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
endif(WIN32)
Fixed soname and build shared lib for CMake. - Build a shared version of the library (used to be only static). - Set the so version name properly since the ABI has changed for version 1.2
2013-02-13 09:29:17 +08:00
source_group("Headers Private" FILES ${TEST_HDR})
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
source_group("Sources" FILES ${TEST_SRCS})
add_executable(${TEST_NAME} ${TEST_SRCS} ${TEST_HDR})
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (LWS_LINK_TESTAPPS_DYNAMIC)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
if (NOT LWS_WITH_SHARED)
Fix some typographical and grammatical errors
2015-10-01 12:25:05 +03:00
message(FATAL_ERROR "Build of the shared library is disabled. LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_SHARED.")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
target_link_libraries(${TEST_NAME} websockets_shared)
add_dependencies(${TEST_NAME} websockets_shared)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
else()
if (NOT LWS_WITH_STATIC)
Fix some typographical and grammatical errors
2015-10-01 12:25:05 +03:00
message(FATAL_ERROR "Build of the static library is disabled. Disabled LWS_LINK_TESTAPPS_DYNAMIC must be combined with LWS_WITH_STATIC.")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
target_link_libraries(${TEST_NAME} websockets)
add_dependencies(${TEST_NAME} websockets)
openssl: need ldl to detect apis when no openssl .so bringing it in test apps also accordingly need building with -ldl
2019-05-27 18:52:28 +08:00
if (UNIX AND LWS_WITH_SSL AND NOT LWS_WITH_MBEDTLS)
target_link_libraries(${TEST_NAME} dl)
endif()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
http: compression methods Add generic http compression layer eanbled at cmake with LWS_WITH_HTTP_STREAM_COMPRESSION. This is wholly a feature of the HTTP role (used by h1 and h2 roles) and doesn't exist outside that context. Currently provides 'deflate' and 'br' compression methods for server side only. 'br' requires also -DLWS_WITH_HTTP_BROTLI=1 at cmake and the brotli libraries (available in your distro already) and dev package. Other compression methods can be added nicely using an ops struct. The built-in file serving stuff will use this is the client says he can handle it, and the mimetype of the file either starts with "text/" (html and css etc) or is the mimetype of Javascript. zlib allocates quite a bit while in use, it seems to be around 256KiB per stream. So this is only useful on relatively strong servers with lots of memory. However for some usecases where you are serving a lot of css and js assets, it's a nice help. The patch performs special treatment for http/1.1 pipelining, since the compression is performed on the fly the compressed content-length is not known until the end. So for h1 only, chunked transfer-encoding is automatically added so pipelining can continue of the connection. For h2 the chunking is neither supported nor required, so it "just works". User code can also request to add a compression transform before the reply headers were sent using the new api LWS_VISIBLE int lws_http_compression_apply(struct lws *wsi, const char *name, unsigned char **p, unsigned char *end, char decomp); ... this allows transparent compression of dynamically generated HTTP. The requested compression (eg, "deflate") is only applied if the client headers indicated it was supported, otherwise it's a NOP. Name may be NULL in which case the first compression method in the internal table at stream.c that is mentioned as acceptable by the client will be used. NOTE: the compression translation, same as h2 support, relies on the user code using LWS_WRITE_HTTP and then LWS_WRITE_HTTP_FINAL on the last part written. The internal lws fileserving code already does this.
2018-09-02 14:43:05 +08:00
if (LWS_WITH_HTTP_STREAM_COMPRESSION)
target_link_libraries(${TEST_NAME} z)
endif()
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
# Set test app specific defines.
set_property(TARGET ${TEST_NAME}
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
PROPERTY COMPILE_DEFINITIONS
cmake fix install path Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-09 12:51:43 +08:00
INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
Fixed linux compilation and added more compile options. - Tested and works on Linux now also, including SSL support. - Look for ZLIB not zlib. - Added CMake options for setting all LWS_ defines.
2013-02-06 15:27:27 +09:00
)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
# Prefix the binary names with libwebsockets.
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set_target_properties(${TEST_NAME}
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
PROPERTIES
OUTPUT_NAME libwebsockets-${TEST_NAME})
# Add to the list of tests.
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
list(APPEND TEST_APP_LIST ${TEST_NAME})
BUGFIX: Fixed bug for installing test-apps for CMake. Appending to the TEST_APP_LIST variable function did not work from within the create_test_app function (It would create a function scope variable with the same name and discard it). We instead need to use a macro for this. The previous commit also removed the duplicate install for the test-apps (because we want all the install steps in one place in the file for clarity). That change made it obvious that the TEST_APP_LIST never gets populated.
2013-02-22 09:28:06 +08:00
endmacro()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
if (UNIX AND LWS_WITH_PLUGINS)
set(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
qnx: add support https://libwebsockets.org/pipermail/libwebsockets/2018-January/003600.html
2018-01-04 10:37:25 +08:00
if(NOT((${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") OR (${CMAKE_SYSTEM_NAME} MATCHES "QNX")))
Update CMakeLists.txt for BSD + libdl Fixing build failure of libwebsockets-test-fraggle on FreeBSD when LWS_WITH_PLUGINS. Solution: FreeBSD has no libdl
2016-11-29 20:45:37 +08:00
target_link_libraries(websockets dl)
endif()
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
endif()
mbedtls and polarssl first part polarssl is the old name for mbedtls. Unfortunately the two are confused in eg, Fedora. For our purposes, polarssl or mbedtls < 2.0 has includes in /usr/include/polarssl and polarssl_ apis and we call that "polarssl". polarssl or mbedtls >=2.0 has includes in /usr/include/mbedtls and mbedtls_ apis, we call that "mbedtls". This has to be spelled out clearly because eg Fedora has a package "mbedtls" which is 1.3.x and has the polarssl_ apis and include path. We will deal with that as "polarssl" despite the package name then. This patch lets you use LWS_USE_POLARSSL or LWS_USE_MBEDTLS and set the include and library path like this cmake .. -DLWS_USE_POLARSSL=1 -DLWS_POLARSSL_INCLUDE_DIRS=/usr/include -DLWS_POLARSSL_LIBRARIES=/usr/lib64/libmbedtls.so.9 This patch adds the cmake support and adapts [private-]libwebsockets.h but doesn't modify the apis in ssl[-*].c yet. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 19:58:02 +08:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_SERVER)
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
#
# test-server
#
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_TEST_SERVER)
clean up top level of project
2017-09-22 09:46:58 +08:00
create_test_app(test-server "test-apps/test-server.c"
refactor: clean out test-apps
2018-04-28 14:11:39 +08:00
""
""
test servers: convert to static inclusion of plugins This eliminates the duplicated implementations of the test protocols, except dumb-increment (which requires libuv). This has various advantages, including bringing all the test servers up to the same set of protocols support. Triggered by finding a bug in server status protocol that was long ago fixed in the plugins version.
2017-06-28 11:16:48 +08:00
""
""
"")
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
if (LWS_WITH_CGI)
create_test_app(test-sshd "test-apps/test-sshd.c"
""
""
""
""
"")
target_include_directories(test-sshd PRIVATE "${PROJECT_SOURCE_DIR}/plugins/ssh-base/include")
endif()
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
endif()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
#
# test-server-extpoll
#
refactor: change event lib minimal examples to serve as the test apps
2018-04-30 19:17:32 +08:00
if (NOT LWS_WITHOUT_TEST_SERVER_EXTPOLL AND NOT WIN32)
refactor: clean out test-apps
2018-04-28 14:11:39 +08:00
create_test_app(test-server-extpoll
"test-apps/test-server.c"
""
""
test servers: convert to static inclusion of plugins This eliminates the duplicated implementations of the test protocols, except dumb-increment (which requires libuv). This has various advantages, including bringing all the test servers up to the same set of protocols support. Triggered by finding a bug in server status protocol that was long ago fixed in the plugins version.
2017-06-28 11:16:48 +08:00
""
""
"")
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
# Set defines for this executable only.
set_property(
TARGET test-server-extpoll
PROPERTY COMPILE_DEFINITIONS
EXTERNAL_POLL
cmake fix install path Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-09 12:51:43 +08:00
INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
)
# We need to link against winsock code.
if (WIN32)
target_link_libraries(test-server-extpoll ws2_32.lib)
cmake some cosmetic improvementss Signed-off-by: Edwin van den Oetelaar <oetelaar.automatisering@gmail.com>
2013-03-10 06:53:57 +08:00
endif(WIN32)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
endif()
Fixed DLL compilation on Windows for CMake. - Define LWS_DLL and LWS_INTERNAL when websockets_shared is compiled. - The websocket_shared target compiles to websocket.lib / websocket.dll (websocket.lib contains the exported functions for websocket.dll, and is the file that is linked to when a program wants to use the dll) - The websocket target compiles to websocket_static.lib on windows. - Replaced any "extern" with "LWS_EXTERN" on libwebsockets.h for proper DLL function exports. - Created a LIB_LIST with all the libwebsocket dependencies, instead of multiple calls to target_link_libraries, only one call is made for both the static and shared library version. This makes it easy to add other variants if wanted in the future. - Added ZLIB as a dependency for the libs, so that the build order will be correct at all times. - Added a dependency for the websockets lib to the test apps, so it is built before them. - Fixed the test-server-extpoll app to include the emulated_poll, and link to winsock on Windows. - Removed the global export of libwebsocket_internal_extensions, and added a function libwebsocket_get_internal_extensions() that returns it instead. Using the global would not work with the DLL export on Windows.
2013-02-13 09:29:26 +08:00
lejp: add test app to parse stdin
2017-10-25 15:52:28 +08:00
if (LWS_WITH_LEJP)
create_test_app(
test-lejp
"test-apps/test-lejp.c"
""
""
""
""
"")
endif()
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
# Data files for running the test server.
gencerts: fix install
2017-12-20 10:42:39 +08:00
list(APPEND TEST_SERVER_DATA
clean up top level of project
2017-09-22 09:46:58 +08:00
"${PROJECT_SOURCE_DIR}/test-apps/favicon.ico"
"${PROJECT_SOURCE_DIR}/test-apps/leaf.jpg"
"${PROJECT_SOURCE_DIR}/test-apps/candide.zip"
boringssl: update
2018-11-23 10:52:39 +08:00
"${PROJECT_SOURCE_DIR}/test-apps/libwebsockets.org-logo.svg"
http2: make usable HTTP/2 support is now able to serve the test server, complete with websockets, from a single vhost. - This works the same with both OpenSSL and mbedTLS. - POST is now wired up and works (also for file upload). - CGI is wired up and works. - Redirect is adapted and works - lwsws works. - URI urldecode, sanitation and argument parsing wired up for :path valgrind clean (aside from openssl-style false uninit data usage in mbedtls send occasionally) h2spec reports: $ h2spec -h 127.0.0.1 -p 7681 -t -k -o 1 ... 145 tests, 145 passed, 0 skipped, 0 failed" Incorporates: - "https://github.com/warmcat/libwebsockets/pull/1039 Fixes issue with -Werror=unused-variable flag - https://github.com/sartura/libwebsockets/commit/2c843a1395bdca5c23b40d989f508fc96aa5ba3b ssl: fix infinite loop on client cert verification failure Signed-off-by: Petar Paradzik <petar.paradzik@sartura.hr>" Caused and fixes Coverity 184887 - 184892
2017-10-13 10:33:02 +08:00
"${PROJECT_SOURCE_DIR}/test-apps/http2.png"
wss-over-h2: show feedback in test page if active
2018-03-22 07:44:02 +08:00
"${PROJECT_SOURCE_DIR}/test-apps/wss-over-h2.png"
clean up top level of project
2017-09-22 09:46:58 +08:00
"${PROJECT_SOURCE_DIR}/test-apps/lws-common.js"
test-app: upgrade test.html to have separate css and js for CSP
2018-08-25 07:22:36 +08:00
"${PROJECT_SOURCE_DIR}/test-apps/test.html"
"${PROJECT_SOURCE_DIR}/test-apps/test.css"
"${PROJECT_SOURCE_DIR}/test-apps/test.js")
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
Fix compilation on Windows. C89 which Microsofts compiler only support does not allow variable declarations anywhere but at the start of a scope. Also, only try to copy the test-server files if they actually exists. For instance the OpenSSL cert generation fails if you run cmake under the git bash shell on Windows (won't work with the unix method either) so that file will be missing... This would result in a compilation error when tests where turned on.
2014-02-18 13:38:14 +01:00
add_custom_command(TARGET test-server
POST_BUILD
CLang gives an error on -O4 clang: error: -O4 is equivalent to -O3
2014-11-26 01:22:50 +08:00
COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server")
Fix compilation on Windows. C89 which Microsofts compiler only support does not allow variable declarations anywhere but at the start of a scope. Also, only try to copy the test-server files if they actually exists. For instance the OpenSSL cert generation fails if you run cmake under the git bash shell on Windows (won't work with the unix method either) so that file will be missing... This would result in a compilation error when tests where turned on.
2014-02-18 13:38:14 +01:00
Fix running test programs from within visual studio. Copy test-server data to a path so that we can run the test-server from within visual studio without having to copy stuff around.
2013-02-22 09:28:17 +08:00
# 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})
Fix compilation on Windows. C89 which Microsofts compiler only support does not allow variable declarations anywhere but at the start of a scope. Also, only try to copy the test-server files if they actually exists. For instance the OpenSSL cert generation fails if you run cmake under the git bash shell on Windows (won't work with the unix method either) so that file will be missing... This would result in a compilation error when tests where turned on.
2014-02-18 13:38:14 +01:00
if (EXISTS ${TEST_FILE})
add_custom_command(TARGET test-server
POST_BUILD
CLang gives an error on -O4 clang: error: -O4 is equivalent to -O3
2014-11-26 01:22:50 +08:00
COMMAND "${CMAKE_COMMAND}" -E copy "${TEST_FILE}" "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server" VERBATIM)
Fix compilation on Windows. C89 which Microsofts compiler only support does not allow variable declarations anywhere but at the start of a scope. Also, only try to copy the test-server files if they actually exists. For instance the OpenSSL cert generation fails if you run cmake under the git bash shell on Windows (won't work with the unix method either) so that file will be missing... This would result in a compilation error when tests where turned on.
2014-02-18 13:38:14 +01:00
endif()
Fix running test programs from within visual studio. Copy test-server data to a path so that we can run the test-server from within visual studio without having to copy stuff around.
2013-02-22 09:28:17 +08:00
endforeach()
cmake and other fixes
2014-02-15 13:48:56 +08:00
endif(NOT LWS_WITHOUT_SERVER)
Fixed build on OSX. - For some reason the "extern int pid_daemon" usage in libwebsockets.c would cause an "undefined symbols" linker error for the test-apps. This only happens with the CMake project, not the normal Makefiles. I have no clue why this is. Fixed it by getting the pid via a function instead. - Added test-server-extpoll - Renamed the library from libwebsocket -> libwebsockets
2013-02-06 15:27:39 +09:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_CLIENT)
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
#
# test-client
#
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_TEST_CLIENT)
clean up top level of project
2017-09-22 09:46:58 +08:00
create_test_app(test-client "test-apps/test-client.c" "" "" "" "" "")
Fixed CMake compile options. Fixed so that the build options for the CMake project works: - The test apps used the LWS_NO_EXTENSIONS define, so they needed lws_config.h included when building using CMake. - Rename some options so that individual test apps can be turned off. - Separate building the test-client/test-server and compiling the server/client parts into the lib. - Don't include server or client specific sources into the build if they shouldn't be built. - Added an error if both client and server parts are excluded at the same time (makes no sense). - Removed duplicate install targets for the test apps. - Commented out the WITH_LIBCRYPTO option since it isn't used at the moment.
2013-02-22 09:28:04 +08:00
endif()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
endif(NOT LWS_WITHOUT_CLIENT)
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
if (LWS_WITH_PLUGINS AND LWS_WITH_SHARED)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
macro(create_plugin PLUGIN_NAME PLUGIN_INCLUDE MAIN_SRC S2 S3)
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
set(PLUGIN_SRCS ${MAIN_SRC})
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
if ("${S2}" STREQUAL "")
else()
list(APPEND PLUGIN_SRCS ${S2})
endif()
if ("${S3}" STREQUAL "")
else()
list(APPEND PLUGIN_SRCS ${S3})
endif()
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
if (WIN32)
win32 more build fixes After alexgille https://github.com/warmcat/libwebsockets/issues/526 Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-14 06:49:29 +08:00
list(APPEND PLUGIN_SRCS
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
${WIN32_HELPERS_PATH}/getopt.c
${WIN32_HELPERS_PATH}/getopt_long.c
${WIN32_HELPERS_PATH}/gettimeofday.c
)
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})
plugins link libwebsockets dynamically Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2016-04-06 18:07:37 +02:00
target_link_libraries(${PLUGIN_NAME} websockets_shared)
add_dependencies(${PLUGIN_NAME} websockets_shared)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
include_directories(${PLUGIN_INCLUDE})
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
# Set test app specific defines.
set_property(TARGET ${PLUGIN_NAME}
PROPERTY COMPILE_DEFINITIONS
INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/plugins"
)
plugins: gitws libjsongit2 support This adds a plugin that interfaces to libjsongit2 https://warmcat.com/git/libjsongit2 to provide a per-vhost service for presenting bare git repos in a web interface.
2018-08-14 08:00:25 +08:00
SET_TARGET_PROPERTIES(${PLUGIN_NAME}
PROPERTIES COMPILE_FLAGS ${CMAKE_C_FLAGS})
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
# set_target_properties(${PLUGIN_NAME}
# PROPERTIES
# OUTPUT_NAME ${PLUGIN_NAME})
list(APPEND PLUGINS_LIST ${PLUGIN_NAME})
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
endmacro()
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
if (LWS_ROLE_WS)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_dumb_increment ""
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
"plugins/protocol_dumb_increment.c" "" "")
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_lws_mirror ""
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
"plugins/protocol_lws_mirror.c" "" "")
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_lws_status ""
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
"plugins/protocol_lws_status.c" "" "")
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_lws_table_dirlisting ""
plugin table dirlisting
2016-06-26 06:29:20 +08:00
"plugins/generic-table/protocol_table_dirlisting.c" "" "")
adoption: make union for socket and file fds This lets lws support adopting raw file FDs and raw socket fds. A test plugin creates a FIFO and prints data sent on it, using the lws event loop.
2017-02-27 12:55:56 +08:00
if (NOT WIN32)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_lws_raw_test ""
adoption: make union for socket and file fds This lets lws support adopting raw file FDs and raw socket fds. A test plugin creates a FIFO and prints data sent on it, using the lws event loop.
2017-02-27 12:55:56 +08:00
"plugins/protocol_lws_raw_test.c" "" "")
plugin: lws deaddrop
2018-11-28 07:25:16 +08:00
create_plugin(protocol_deaddrop ""
"plugins/deaddrop/protocol_lws_deaddrop.c" "" "")
adoption: make union for socket and file fds This lets lws support adopting raw file FDs and raw socket fds. A test plugin creates a FIFO and prints data sent on it, using the lws event loop.
2017-02-27 12:55:56 +08:00
endif()
plugin table dirlisting
2016-06-26 06:29:20 +08:00
plugin lws server status Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 14:01:29 +08:00
if (LWS_WITH_SERVER_STATUS)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_lws_server_status ""
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
"plugins/protocol_lws_server_status.c" "" "")
plugin lws server status Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 14:01:29 +08:00
endif()
protocol_client_loopback_test This is used to confirm that SSL client connections can coexist with a vhost doing serving. To set it up, /* * This is a bit fiddly... * * 0) If you want the wss:// test to work, make sure the vhost is marked with * enable-client-ssl if using lwsws, or call lws_init_vhost_client_ssl() on * the vhost if you're doing it by hand. * * 1) enable the protocol on a vhost * * "ws-protocols": [{ * "client-loopback-test": { * "status": "ok" * }, ... * * the vhost should listen on 80 (ws://) or 443 (wss://) * * 2) mount the http part of the test one level down on the same vhost, eg * { * "mountpoint": "/c", * "origin": "callback://client-loopback-test" * } * * 3) Use a browser to visit the mountpoint with a URI attached for looping * back, eg, if testing on localhost * * http://localhost/c/ws://localhost * https://localhost/c/wss://localhost * * 4) The HTTP part of this test protocol will try to do the requested * ws client connection, to the same test protocol on the same * server. */ Results should look like this lwsws[29938]: client connection to localhost:443 with ssl: 1 started lwsws[29938]: server part: LWS_CALLBACK_ESTABLISHED lwsws[29938]: checking client ext permessage-deflate lwsws[29938]: instantiating client ext permessage-deflate lwsws[29938]: Client connection established lwsws[29938]: Client connection received 7 from server 'Made it' Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-12 19:45:04 +08:00
if (NOT LWS_WITHOUT_CLIENT)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_client_loopback_test ""
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
"plugins/protocol_client_loopback_test.c" "" "")
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
endif()
endif()
create_plugin(protocol_post_demo ""
"plugins/protocol_post_demo.c" "" "")
role: raw-proxy
2018-11-29 08:29:48 +08:00
if (LWS_ROLE_RAW_PROXY)
create_plugin(protocol_lws_raw_proxy ""
"plugins/raw-proxy/protocol_lws_raw_proxy.c" "" "")
endif()
fulltext search
2018-10-14 11:38:08 +08:00
if (LWS_WITH_FTS)
create_plugin(protocol_fulltext_demo ""
"plugins/protocol_fulltext_demo.c" "" "")
endif()
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
if (LWS_WITH_SSL)
create_plugin(protocol_lws_ssh_base "plugins/ssh-base/include"
"plugins/ssh-base/sshd.c;plugins/ssh-base/telnet.c;plugins/ssh-base/kex-25519.c" "plugins/ssh-base/crypto/chacha.c;plugins/ssh-base/crypto/ed25519.c;plugins/ssh-base/crypto/fe25519.c;plugins/ssh-base/crypto/ge25519.c;plugins/ssh-base/crypto/poly1305.c;plugins/ssh-base/crypto/sc25519.c;plugins/ssh-base/crypto/smult_curve25519_ref.c" "")
create_plugin(protocol_lws_sshd_demo "plugins/ssh-base/include" "plugins/protocol_lws_sshd_demo.c" "" "")
include_directories("${PROJECT_SOURCE_DIR}/plugins/ssh-base/include")
endif()
protocol_client_loopback_test This is used to confirm that SSL client connections can coexist with a vhost doing serving. To set it up, /* * This is a bit fiddly... * * 0) If you want the wss:// test to work, make sure the vhost is marked with * enable-client-ssl if using lwsws, or call lws_init_vhost_client_ssl() on * the vhost if you're doing it by hand. * * 1) enable the protocol on a vhost * * "ws-protocols": [{ * "client-loopback-test": { * "status": "ok" * }, ... * * the vhost should listen on 80 (ws://) or 443 (wss://) * * 2) mount the http part of the test one level down on the same vhost, eg * { * "mountpoint": "/c", * "origin": "callback://client-loopback-test" * } * * 3) Use a browser to visit the mountpoint with a URI attached for looping * back, eg, if testing on localhost * * http://localhost/c/ws://localhost * https://localhost/c/wss://localhost * * 4) The HTTP part of this test protocol will try to do the requested * ws client connection, to the same test protocol on the same * server. */ Results should look like this lwsws[29938]: client connection to localhost:443 with ssl: 1 started lwsws[29938]: server part: LWS_CALLBACK_ESTABLISHED lwsws[29938]: checking client ext permessage-deflate lwsws[29938]: instantiating client ext permessage-deflate lwsws[29938]: Client connection established lwsws[29938]: Client connection received 7 from server 'Made it' Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-12 19:45:04 +08:00
ACME client plugin This adds support for a plugin that can be attached to a vhost to acquire and maintain its TLS cert automatically. It works the same with both OpenSSL and mbedTLS backends, but they can't share auth keys, delete the 'auth.jwk' file as it is in the example JSON when switching between libs
2017-10-21 06:36:35 +08:00
if (LWS_WITH_ACME)
create_plugin(protocol_lws_acme_client ""
"plugins/acme-client/protocol_lws_acme_client.c" "" "")
endif()
cmake: allow setting LWS_ROLE_WS You can build lws without support for ws, with -DLWS_ROLE_WS=0. This is thanks to the role ops isolating all the ws-specific business in the ws role. Also retire more test apps replaced by minmal-examples.
2018-04-25 08:42:18 +08:00
if (LWS_WITH_GENERIC_SESSIONS AND LWS_ROLE_WS)
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_generic_sessions ""
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
"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)
protocol-lws-messageboard This is a simple messageboard built on top of lwsgs Signed-off-by: Andy Green <andy@warmcat.com>
2016-06-15 12:24:38 +08:00
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
create_plugin(protocol_lws_messageboard ""
protocol-lws-messageboard This is a simple messageboard built on top of lwsgs Signed-off-by: Andy Green <andy@warmcat.com>
2016-06-15 12:24:38 +08:00
"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)
qa: add 6 x h2load tests
2018-04-27 11:19:09 +08:00
endif(LWS_WITH_GENERIC_SESSIONS AND LWS_ROLE_WS)
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
endif(LWS_WITH_PLUGINS AND LWS_WITH_SHARED)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
#
# Copy OpenSSL dlls to the output directory on Windows.
# (Otherwise we'll get an error when trying to run)
#
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
if (WIN32 AND LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
if(OPENSSL_BIN_FOUND)
Fixed ssl cert generation on Windows.
2013-02-22 09:28:11 +08:00
message("OpenSSL dlls found:")
message(" Libeay: ${LIBEAY_BIN}")
message(" SSLeay: ${SSLEAY_BIN}")
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
foreach(TARGET_BIN ${TEST_APP_LIST})
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
add_custom_command(TARGET ${TARGET_BIN}
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
POST_BUILD
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
COMMAND "${CMAKE_COMMAND}" -E copy "${LIBEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
add_custom_command(TARGET ${TARGET_BIN}
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
POST_BUILD
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
COMMAND "${CMAKE_COMMAND}" -E copy "${SSLEAY_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
appveyor artifacts debug
2017-10-26 07:24:45 +08:00
#
# Win32: if we are using libuv, also need to copy it in the output dir
#
if (WIN32 AND LWS_WITH_LIBUV)
STRING(REPLACE ".lib" ".dll" LIBUV_BIN ${LIBUV_LIBRARIES})
add_custom_command(TARGET ${TARGET_BIN}
POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy "${LIBUV_BIN}" "$<TARGET_FILE_DIR:${TARGET_BIN}>" VERBATIM)
endif()
CMake support + fixed windows build. - Finalized CMake support (tested on windows only so far). - Uses a generated lws_config.h that is included in private-libwebsocket to pass defines, only used if CMAKE_BUILD is set. - Support for SSL on Windows. - Initial support for CyaSSL replacement of OpenSSL (This has been added to my older CMake-fork but haven't been tested on this version yet). - Fixed windows build (see below for details). - Fixed at least the 32-bit Debug build for the existing Visual Studio Project. (Not to keen fixing all the others when we have CMake support anyway (which can generate much better project files)...) - BUGFIXES: - handshake.c - used C99 definition of handshake_0405 function - libwebsocket.c - syslog not available on windows, put in ifdefs. - Fixed previous known crash bug on Windows where WSAPoll in Ws2_32.dll would not be present, causing the poll function pointer being set to NULL. - Uninitialized variable context->listen_service_extraseen would result in stack overflow because of infinite recursion. Fixed by initializing in libwebsocket_create_context - SO_REUSADDR means something different on Windows compared to Unix. - Setting a socket to nonblocking is done differently on Windows. (This should probably broken out into a helper function instead) - lwsl_emit_syslog -> lwsl_emit_stderr on Windows. - private-libwebsocket.h - PATH_MAX is not available on Windows, define as MAX_PATH - Always define LWS_NO_DAEMONIZE on windows. - Don't define lws_latency as inline that does nothing. inline is not support by the Microsoft compiler, replaced with an empty define instead. (It's __inline in MSVC) - server.c - Fixed nonblock call on windows - test-ping.c - Don't use C99 features (Microsoft compiler does not support it). - Move non-win32 headers into ifdefs. - Skip use of sighandler on Windows. - test-server.c - ifdef syslog parts on Windows.
2013-02-06 15:26:58 +09:00
endforeach()
endif()
endif()
refactor: change event lib minimal examples to serve as the test apps
2018-04-30 19:17:32 +08:00
endif((LWS_ROLE_H1 OR LWS_ROLE_H2) AND NOT LWS_WITHOUT_TESTAPPS)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
lwsws Libwebsockets Web Server This makes a start on the LibWebSockets WebServer. The app cmake build support and JSON config parsing are implemented and the app can start, create the vhosts, listen and serve file:// mounts on them. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 10:12:37 +08:00
if (LWS_WITH_LWSWS)
list(APPEND LWSWS_SRCS
"lwsws/main.c"
)
if (WIN32)
list(APPEND LWSWS_SRCS
${WIN32_HELPERS_PATH}/getopt.c
${WIN32_HELPERS_PATH}/getopt_long.c
${WIN32_HELPERS_PATH}/gettimeofday.c
)
list(APPEND LWSWS_HDR
${WIN32_HELPERS_PATH}/getopt.h
${WIN32_HELPERS_PATH}/gettimeofday.h
)
endif(WIN32)
source_group("Headers Private" FILES ${LWSWS_HDR})
source_group("Sources" FILES ${LWSWS_SRCS})
add_executable("lwsws" ${LWSWS_SRCS} ${LWSWS_HDR})
plugins also link lwsws against websockets_shared Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-07 03:10:54 +08:00
target_link_libraries("lwsws" websockets_shared)
add_dependencies("lwsws" websockets_shared)
lwsws Libwebsockets Web Server This makes a start on the LibWebSockets WebServer. The app cmake build support and JSON config parsing are implemented and the app can start, create the vhosts, listen and serve file:// mounts on them. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 10:12:37 +08:00
# Set test app specific defines.
set_property(TARGET "lwsws"
PROPERTY COMPILE_DEFINITIONS
INSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share"
)
endif (LWS_WITH_LWSWS)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
if (UNIX)
# Generate and install pkgconfig.
# (This is not indented, because the tabs will be part of the output)
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets.pc"
unconfuse quoting in CMakeLists.txtt via Marjan Tomas https://github.com/warmcat/libwebsockets/issues/67 Signed-off-by: Andy Green <andy.green@linaro.org>
2014-02-27 07:28:45 +08:00
"prefix=\"${CMAKE_INSTALL_PREFIX}\"
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
exec_prefix=\${prefix}
cmake lib lib64 problem As discussed here, there's a semi-standardized way to inform cmake that the install target wants its libs in .../lib64 https://code.google.com/p/bullet/issues/detail?id=174 this patch adds the necessary fiddling Signed-off-by: Andy Green <andy.green@linaro.org>
2013-02-26 11:58:45 +08:00
libdir=\${exec_prefix}/lib${LIB_SUFFIX}
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
includedir=\${prefix}/include
Name: libwebsockets
Description: Websockets server and client library
Subject: [PATCH] Add LWS_LIBRARY_VERSION_NUMBER to lws_config.h. This changeset adds a few preprocessor macros to lws_config.h to allow a user of libwebsockets to determine at compile time which version of lws they are compiling against. This exposes the already existing LWS_LIBRARY_VERSION_MAJOR and _MINOR values, and adds LWS_LIBRARY_VERSION_PATCH. This suggests that future minor bugfix release versions of lws would be e.g. 1.6.0 -> 1.6.1 rather than the style used previously: 1.2 -> 1.21. The way this is currently set up means new minor revisions (with _PATCH==0) always end with .0 but I could change this if preferred. The most important addition is LWS_LIBRARY_VERSION_NUMBER, which produces a number of the form 1005001 for version 1.5.1 - i.e. each part major, minor, patch can extend from 0-999. This macro allows a very easy compile time comparison of version numbers.
2015-12-14 17:25:29 +00:00
Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
Libs: -L\${libdir} -lwebsockets
Cflags: -I\${includedir}"
)
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
cmake packageconfig installs to lib dir Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-10 08:10:19 +08:00
DESTINATION lib${LIB_SUFFIX}/pkgconfig)
pkgconfig https://github.com/warmcat/libwebsockets/issues/933
2017-06-19 12:29:48 +08:00
file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
"prefix=\"${CMAKE_INSTALL_PREFIX}\"
exec_prefix=\${prefix}
libdir=\${exec_prefix}/lib${LIB_SUFFIX}
includedir=\${prefix}/include
Name: libwebsockets_static
Description: Websockets server and client static library
Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
Libs: -L\${libdir} -lwebsockets_static
Libs.private:
Cflags: -I\${includedir}"
)
install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
DESTINATION lib${LIB_SUFFIX}/pkgconfig)
cmake some cosmetic improvementss Signed-off-by: Edwin van den Oetelaar <oetelaar.automatisering@gmail.com>
2013-03-10 06:53:57 +08:00
endif(UNIX)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
#
# Installation preparations.
#
if(WIN32 AND NOT CYGWIN)
set(DEF_INSTALL_CMAKE_DIR cmake)
else()
From 7f39ea761e98ea96f79a7e69d4cdeee0c39d316e Mon Sep 17 00:00:00 2001 Subject: [PATCH] fix missing ${LIB_SUFFIX} on cmake config dir
2016-01-17 13:54:13 +08:00
set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets)
cmake and other fixes
2014-02-15 13:48:56 +08:00
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).
Add a flag to disable CMake exports Add LWS_EXPORT_LWSTARGETS (defaults to ON) that can be used to disable CMake export targets as well as install export for libwebsockets. AG: add _WITH_
2017-11-20 12:41:29 +01:00
if (LWS_WITH_EXPORT_LWSTARGETS)
export(TARGETS ${LWS_LIBRARIES}
FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
endif()
cmake and other fixes
2014-02-15 13:48:56 +08:00
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)
# Generate the config file for the installation tree.
Fix installation into relative installation directory This is required to make the other CPack generators like "ZIP" work.
2014-02-28 16:29:28 +01:00
get_filename_component(LWS_ABSOLUTE_INSTALL_CMAKE_DIR ${LWS_INSTALL_CMAKE_DIR} ABSOLUTE)
get_filename_component(LWS_ABSOLUTE_INSTALL_INCLUDE_DIR ${LWS_INSTALL_INCLUDE_DIR} ABSOLUTE)
cmake and other fixes
2014-02-15 13:48:56 +08:00
file(RELATIVE_PATH
REL_INCLUDE_DIR
Fix installation into relative installation directory This is required to make the other CPack generators like "ZIP" work.
2014-02-28 16:29:28 +01:00
"${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
"${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
cmake and other fixes
2014-02-15 13:48:56 +08:00
# 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)
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set_target_properties(${LWS_LIBRARIES}
cmake and other fixes
2014-02-15 13:48:56 +08:00
PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")
#
# Installation.
#
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
libwebsockets.h: split out into a dir of sub-includes included by libwebsockets.h This has no effect on user code or backward compatibility. It moves the in-tree public api header libwebsockets.h from ./lib to ./include, and introduces a dir ./include/libwebsockets/ The single public api header is split out into 31 sub-headers in ./include/libwebsockets. ./include/libwebsockets.h contains some core types and platform adaptation code, but the rest of it is now 31 #include <libwebsockets/...> At install time, /usr/[local/]include/libwebsockets.h is installed as before, along now with the 31 sub-headers in ...include/libwebsockets/ There's no net effect on user code. But the api header is now much easier to maintain and study, with 31 topic-based sub headers.
2018-08-23 09:46:01 +08:00
install(DIRECTORY include/libwebsockets
DESTINATION "${LWS_INSTALL_INCLUDE_DIR}" COMPONENT dev_headers)
cmake and other fixes
2014-02-15 13:48:56 +08:00
# Install libs and headers.
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
install(TARGETS ${LWS_LIBRARIES}
cmake and other fixes
2014-02-15 13:48:56 +08:00
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)
libwebsockets.h: split out into a dir of sub-includes included by libwebsockets.h This has no effect on user code or backward compatibility. It moves the in-tree public api header libwebsockets.h from ./lib to ./include, and introduces a dir ./include/libwebsockets/ The single public api header is split out into 31 sub-headers in ./include/libwebsockets. ./include/libwebsockets.h contains some core types and platform adaptation code, but the rest of it is now 31 #include <libwebsockets/...> At install time, /usr/[local/]include/libwebsockets.h is installed as before, along now with the 31 sub-headers in ...include/libwebsockets/ There's no net effect on user code. But the api header is now much easier to maintain and study, with 31 topic-based sub headers.
2018-08-23 09:46:01 +08:00
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
cmake and other fixes
2014-02-15 13:48:56 +08:00
set(CPACK_COMPONENT_DEV_DISPLAY_NAME "Development files")
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
# Install test apps.
cmake: fix logic for individual test client build disable
2017-06-28 09:50:54 +08:00
if (NOT LWS_WITHOUT_TESTAPPS)
install(TARGETS ${TEST_APP_LIST}
cmake and other fixes
2014-02-15 13:48:56 +08:00
RUNTIME DESTINATION ${LWS_INSTALL_EXAMPLES_DIR}
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
COMPONENT examples)
cmake and other fixes
2014-02-15 13:48:56 +08:00
set(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example files")
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
endif()
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
lwsws Libwebsockets Web Server This makes a start on the LibWebSockets WebServer. The app cmake build support and JSON config parsing are implemented and the app can start, create the vhosts, listen and serve file:// mounts on them. Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-28 10:12:37 +08:00
# lwsws
if (LWS_WITH_LWSWS)
install(TARGETS lwsws
RUNTIME DESTINATION "${LWS_INSTALL_BIN_DIR}" COMPONENT lwsws )
endif()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
# Programs shared files used by the test-server.
cmake and other fixes
2014-02-15 13:48:56 +08:00
if (NOT LWS_WITHOUT_TESTAPPS AND NOT LWS_WITHOUT_SERVER)
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
install(FILES ${TEST_SERVER_DATA}
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
DESTINATION share/libwebsockets-test-server
basic-auth
2016-12-03 15:13:15 +08:00
COMPONENT examples)
clean up top level of project
2017-09-22 09:46:58 +08:00
install(FILES "${PROJECT_SOURCE_DIR}/test-apps/private/index.html"
basic-auth
2016-12-03 15:13:15 +08:00
DESTINATION share/libwebsockets-test-server/private
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
COMPONENT examples)
cgi Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-21 21:25:48 +08:00
if (LWS_WITH_CGI)
clean up top level of project
2017-09-22 09:46:58 +08:00
set(CGI_TEST_SCRIPT "${PROJECT_SOURCE_DIR}/test-apps/lws-cgi-test.sh")
cgi Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-21 21:25:48 +08:00
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()
Added "make install" support to the CMake project. - Does everything as the autoconf script does (I think). - Generates SSL certs for the test-server - Installs all test apps. - Defaults to /usr/local/ - "DESTDIR=/bla make install" works - Append "libwebsockets" to start of the test-app names like the autoconf stuff does. - Only tested on OSX so far...
2013-02-19 10:14:37 +08:00
endif()
cmake: only generate test cert when SERVER and TESTAPPS enabled apart from LWS_WITHOUT_TEST_SERVER the test server will also not be built if LWS_WITHOUT_TESTAPPS or LWS_WITHOUT_SERVER is defined, we update the CMake configuration to skip cert generation and installation in those cases. Signed-off-by: Adam Wolk <adam.wolk@koparo.com>
2017-11-25 20:15:29 +01:00
if (NOT LWS_WITHOUT_TEST_SERVER AND NOT LWS_WITHOUT_SERVER AND NOT LWS_WITHOUT_TESTAPPS)
install(FILES test-apps/lws-ssh-test-keys;test-apps/lws-ssh-test-keys.pub
DESTINATION share/libwebsockets-test-server
COMPONENT examples)
endif()
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
# plugins
if (LWS_WITH_PLUGINS)
install(TARGETS ${PLUGINS_LIST}
plugins link libwebsockets dynamically Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2016-04-06 18:07:37 +02:00
PERMISSIONS OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_READ GROUP_READ WORLD_READ
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
DESTINATION share/libwebsockets-test-server/plugins
COMPONENT plugins)
plugin: lws deaddrop
2018-11-28 07:25:16 +08:00
if (NOT WIN32)
install(FILES plugins/deaddrop/assets/index.html;plugins/deaddrop/assets/deaddrop.js;plugins/deaddrop/assets/deaddrop.css;plugins/deaddrop/assets/drop.svg
DESTINATION share/libwebsockets-test-server/deaddrop
COMPONENT plugins)
endif()
plugin lws server status Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 14:01:29 +08:00
if (LWS_WITH_SERVER_STATUS)
test-app: upgrade test.html to have separate css and js for CSP
2018-08-25 07:22:36 +08:00
install(FILES plugins/server-status.html;plugins/server-status.js;plugins/server-status.css;plugins/lwsws-logo.png
plugin lws server status Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 14:01:29 +08:00
DESTINATION share/libwebsockets-test-server/server-status
COMPONENT examples)
endif()
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
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
csp: update lwsgs
2018-08-29 07:15:34 +08:00
plugins/generic-sessions/assets/lwsgs.css
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
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)
endif()
plugin table dirlisting
2016-06-26 06:29:20 +08:00
install(FILES
plugins/generic-table/assets/lwsgt.js
plugins/generic-table/assets/index.html
DESTINATION share/libwebsockets-test-server/generic-table
COMPONENT examples)
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
endif()
cmake additionally install cmake config
2015-12-08 10:26:57 +08:00
# Install the LibwebsocketsConfig.cmake and LibwebsocketsConfigVersion.cmake
install(FILES
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LibwebsocketsConfig.cmake"
"${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake"
DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev)
revert cmake remove targets from install path Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-29 18:27:32 +08:00
# Install exports for the install-tree.
Add a flag to disable CMake exports Add LWS_EXPORT_LWSTARGETS (defaults to ON) that can be used to disable CMake export targets as well as install export for libwebsockets. AG: add _WITH_
2017-11-20 12:41:29 +01:00
if (LWS_WITH_EXPORT_LWSTARGETS)
install(EXPORT LibwebsocketsTargets
DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev)
endif()
revert cmake remove targets from install path Signed-off-by: Andy Green <andy@warmcat.com>
2016-03-29 18:27:32 +08:00
cmake ignore non source things for make dist Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-10 08:11:48 +08:00
# build subdir is not part of sources
cmake: CPACK_SOURCE_IGNORE_FILES is a list of regular expressions
2018-05-26 09:19:54 +08:00
set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) "/.git/" "/build/" "\\\\.tgz$" "\\\\.tar\\\\.gz$")
cmake ignore non source things for make dist Signed-off-by: Andy Green <andy.green@linaro.org>
2013-03-10 08:11:48 +08:00
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
# Most people are more used to "make dist" compared to "make package_source"
fix cmake quoting A few parameters (like "${PROJECT_BINARY_DIR}/lws_config.h" and "${PROJECT_SOURCE_DIR}/lib") are passed to CMake commands in your build script without enclosing them by quotation marks. I see that these places will result in build difficulties if the contents of the used variables will contain special characters like spaces. Signed-off-by: Markus Elfring <markus.elfring@web.de>
2013-10-26 20:03:43 +08:00
add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source)
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
include(UseRPMTools)
if (RPMTools_FOUND)
clean up top level of project
2017-09-22 09:46:58 +08:00
RPMTools_ADD_RPM_TARGETS(libwebsockets scripts/libwebsockets.spec)
cmake and other fixes
2014-02-15 13:48:56 +08:00
endif()
message("---------------------------------------------------------------------")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
message(" Settings: (For more help do cmake -LH <srcpath>)")
cmake and other fixes
2014-02-15 13:48:56 +08:00
message("---------------------------------------------------------------------")
Implemented fixes allowing libwebsockets to be built under Windows using MinGM/MSYS Improvemed patches to address travis and appveyor build errors Reduced WINVER and _WIN32_WINNT to 0x0501 to be less restrictive Refined CMakeLists.txt to allow for normal Windows and MinGW-specific OpenSSL certificate generation Simplified include path to gettimeofday.h Removed unnecessary list(APPEND LWS_LIBRARIES zlib_internal) export Added back #include <windows.h> to gettimeofday.c to fix build for normal Windows Made sure that pollfd gets defined on libwebsockets side when _WIN32_WINNT < 0x0600 Made sure that WINVER and _WIN32_WINNT don't get overridden by libwebsockets headers when already set to something greater than 0x0501 Added missing declaration of WSAPoll function for WINVER < 0x0600 in libwebsockets.h, eliminated invalid usages of pollfd instead of libwebsocket_pollfd in test-server.c Cleaned up duplicate content in gettimeofday.c, removed header inclusions from gettimeofday.h and fixed include order in test-echo.c, test-ping.c and test-server.c to enable build with normal Windows and MinGW Re-enabled debug_level in test-echo.c and made sure that the call to lws_set_log_level() is also active under Windows (just like in test-server.c); replaced all WIN32 occurrences by _WIN32 in test-echo.c, test-ping.c, and test-server.c Removed build-msys.sh and added new section about how to build libwebsockets using MinGW to README.build.md
2015-10-23 08:10:55 +02:00
message(" LWS_WITH_STATIC = ${LWS_WITH_STATIC}")
message(" LWS_WITH_SHARED = ${LWS_WITH_SHARED}")
message(" LWS_WITH_SSL = ${LWS_WITH_SSL} (SSL Support)")
ssl client use OS CA root certs by default Signed-off-by: Andy Green <andy.green@linaro.org>
2014-03-15 10:39:29 +08:00
message(" LWS_SSL_CLIENT_USE_OS_CA_CERTS = ${LWS_SSL_CLIENT_USE_OS_CA_CERTS}")
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
message(" LWS_WITH_WOLFSSL = ${LWS_WITH_WOLFSSL} (wolfSSL/CyaSSL replacement for OpenSSL)")
if (LWS_WITH_WOLFSSL)
Move from CyaSSL to wolfSSL This patch lets libwebsockets use the lastest version of wolfSSL (the new name for CyaSSL). The reason for the patch is that allthough wolfSSL provides compatibility headers for (old) projects using CyaSSL, these are incomplete and do not work for libwebsockets. The patch also fixes a typo in CMakeLists.txt where CYASSL_LIBRARIES was added to include_directories() instead of CYASSL_INCLUDE_DIRS. Signed-off-by: ABruines <alexander.bruines@gmail.com>
2015-08-08 18:54:49 +02:00
message(" LWS_WOLFSSL_LIBRARIES = ${LWS_WOLFSSL_LIBRARIES}")
message(" LWS_WOLFSSL_INCLUDE_DIRS = ${LWS_WOLFSSL_INCLUDE_DIRS}")
cmake and other fixes
2014-02-15 13:48:56 +08:00
endif()
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
message(" LWS_WITH_MBEDTLS = ${LWS_WITH_MBEDTLS} (mbedTLS replacement for OpenSSL)")
LWS_WITHOUT_BUILTIN_SHA1 Signed-off-by: Andy Green <andy.green@linaro.org>
2015-10-15 11:20:40 +08:00
message(" LWS_WITHOUT_BUILTIN_SHA1 = ${LWS_WITHOUT_BUILTIN_SHA1}")
cmake and other fixes
2014-02-15 13:48:56 +08:00
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_CLIENT = ${LWS_WITHOUT_TEST_CLIENT}")
message(" LWS_WITHOUT_EXTENSIONS = ${LWS_WITHOUT_EXTENSIONS}")
message(" LWS_WITH_LATENCY = ${LWS_WITH_LATENCY}")
message(" LWS_WITHOUT_DAEMONIZE = ${LWS_WITHOUT_DAEMONIZE}")
CMake: convert all LWS_USE_... to LWS_WITH_... Almost all the CMake options begin with LWS_WITH_..., but many of the symbols passed to lws are LWS_USE_... , this causes neededless confusion, compounded by the fact that a few CMake options also begin with LWS_USE_. This patch globally converts all LWS_USE_... to LWS_WITH_..., so there is only one prefix to remember in both CMake and the code. The affected public CMake options are LWS_USE_BORINGSSL -> LWS_WITH_BORINGSSL LWS_USE_CYASSL -> LWS_WITH_CYASSL LWS_USE_WOLFSSL -> LWS_WITH_WOLFSSL LWS_USE_MBEDTLS -> LWS_WITH_MBEDTLS LWS_USE_BUNDLED_ZLIB -> LWS_WITH_BUNDLED_ZLIB
2017-09-28 11:29:03 +08:00
message(" LWS_WITH_LIBEV = ${LWS_WITH_LIBEV}")
message(" LWS_WITH_LIBUV = ${LWS_WITH_LIBUV}")
message(" LWS_WITH_LIBEVENT = ${LWS_WITH_LIBEVENT}")
http2 add initial alpn support Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-03 14:33:48 +08:00
message(" LWS_IPV6 = ${LWS_IPV6}")
Add unix domain socket
2016-03-30 22:47:02 -07:00
message(" LWS_UNIX_SOCK = ${LWS_UNIX_SOCK}")
http2 add initial alpn support Signed-off-by: Andy Green <andy.green@linaro.org>
2014-04-03 14:33:48 +08:00
message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
ssl add ECDH server support (AG clean style add option flag and docs)
2016-01-15 16:21:51 +08:00
message(" LWS_SSL_SERVER_WITH_ECDH_CERT = ${LWS_SSL_SERVER_WITH_ECDH_CERT}")
multithreaded service This adds support for multithreaded service to lws without adding any threading or locking code in the library. At context creation time you can request split the service part of the context into n service domains, which are load-balanced so that the most idle one gets the next listen socket accept. There's a single listen socket on one port still. User code may then spawn n threads doing n service loops / poll()s simultaneously. Locking is only required (I think) in the existing FD lock callbacks already handled by the pthreads server example, and that locking takes place in user code. So the library remains completely agnostic about the threading / locking scheme. And by default, it's completely compatible with one service thread so no changes are required by people uninterested in multithreaded service. However for people interested in extremely lightweight mass http[s]/ ws[s] service with minimum provisioning, the library can now do everything out of the box. To test it, just try $ libwebsockets-test-server-pthreads -j 8 where -j controls the number of service threads Signed-off-by: Andy Green <andy.green@linaro.org>
2016-01-19 03:34:24 +08:00
message(" LWS_MAX_SMP = ${LWS_MAX_SMP}")
pthreads: build test server based on pthreads.h availability ... and fix signed / unsigned comparison
2018-03-02 09:01:22 +08:00
message(" LWS_HAVE_PTHREAD_H = ${LWS_HAVE_PTHREAD_H}")
cgi Signed-off-by: Andy Green <andy.green@linaro.org>
2016-02-21 21:25:48 +08:00
message(" LWS_WITH_CGI = ${LWS_WITH_CGI}")
ssl ecdh adapt if missing ecdh.h include https://github.com/warmcat/libwebsockets/issues/457
2016-03-12 08:37:36 +08:00
message(" LWS_HAVE_OPENSSL_ECDH_H = ${LWS_HAVE_OPENSSL_ECDH_H}")
Add testapps support for client certs and CRLs AG: plumb into cmake to avoid travis mac blowing up
2016-04-13 22:17:05 +02:00
message(" LWS_HAVE_SSL_CTX_set1_param = ${LWS_HAVE_SSL_CTX_set1_param}")
Plugins: add ssh-base ssh server plugin
2017-10-16 16:59:57 +08:00
message(" LWS_HAVE_RSA_SET0_KEY = ${LWS_HAVE_RSA_SET0_KEY}")
proxy rewrite If you enable -DLWS_WITH_HTTP_PROXY=1 at cmake, the test server has a new URI path http://localhost:7681/proxytest If you visit here, a client connection to http://example.com:80 is spawned, and the results piped on to your original connection. Also with LWS_WITH_HTTP_PROXY enabled at cmake, lws wants to link to an additional library, "libhubbub". This allows lws to do html rewriting on the fly, adjusting proxied urls in a lightweight and fast way.
2016-03-20 11:59:53 +08:00
message(" LWS_WITH_HTTP_PROXY = ${LWS_WITH_HTTP_PROXY}")
message(" LIBHUBBUB_LIBRARIES = ${LIBHUBBUB_LIBRARIES}")
plugins This adds support for dynamically loaded plugins at runtime, which can expose their own protocols or extensions transparently. With these changes lwsws defaults to OFF in cmake, and if enabled it automatically enables plugins and libuv support. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-06 16:15:40 +08:00
message(" PLUGINS = ${PLUGINS_LIST}")
lws access log option and lwsws conf This adds the ability to store apache-compatible logs to a file given at vhost-creation time. lwsws conf can set it per-vhost using "access-log": "<filepath>" The feature defaults to disabled at cmake, it can be set independently but LWS_WITH_LWSWS set it on. Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 12:00:23 +08:00
message(" LWS_WITH_ACCESS_LOG = ${LWS_WITH_ACCESS_LOG}")
plugin lws server status Signed-off-by: Andy Green <andy@warmcat.com>
2016-04-15 14:01:29 +08:00
message(" LWS_WITH_SERVER_STATUS = ${LWS_WITH_SERVER_STATUS}")
lejp bring into lws lejp is already in lws as part of lwsws. However it's too generally useful to just put directly in lwsws, it will lead to multiple copies of the source in differet subprojects. This moves it directly into lws, lwsws now gets it from there. Like lwsws, by default at cmake it is disabled. Selecting LWS_WITH_LWSWS now selects LWS_WITH_LEJP and you can set that at cmake individually as well. Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-10 09:47:10 +08:00
message(" LWS_WITH_LEJP = ${LWS_WITH_LEJP}")
lwsws conf.c migrate to lib Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-26 21:12:11 +08:00
message(" LWS_WITH_LEJP_CONF = ${LWS_WITH_LEJP_CONF}")
smtp Signed-off-by: Andy Green <andy@warmcat.com>
2016-06-07 09:49:59 +08:00
message(" LWS_WITH_SMTP = ${LWS_WITH_SMTP}")
protocol generic sessions Signed-off-by: Andy Green <andy@warmcat.com>
2016-05-19 15:28:31 +08:00
message(" LWS_WITH_GENERIC_SESSIONS = ${LWS_WITH_GENERIC_SESSIONS}")
Added option to build the static library with PIC
2016-09-27 05:32:40 +08:00
message(" LWS_STATIC_PIC = ${LWS_STATIC_PIC}")
RFC7233 HTTP Ranges support for server This adds a serverside implementation of RFC7233 HTTP ranges. - LWS_WITH_RANGES is on by default at cmake - Accept-Ranges: bytes is added if LWS_WITH_RANGES is enabled - Both single ranges and multipart (2+) ranges are supported Test with curl like this Single $ $ curl -s -r 64-95 http://localhost:7681/libwebsockets.org-logo.png | hexdump -C 00000000 2e 01 fd 9d 12 27 00 00 00 19 74 45 58 74 53 6f |.....'....tEXtSo| 00000010 66 74 77 61 72 65 00 77 77 77 2e 69 6e 6b 73 63 |ftware.www.inksc| Multipart $ curl -s -r 64-95,128-143 http://localhost:7681/libwebsockets.org-logo.png | hexdump -C 00000000 5f 6c 77 73 0d 0a 43 6f 6e 74 65 6e 74 2d 54 79 |_lws..Content-Ty| 00000010 70 65 3a 20 69 6d 61 67 65 2f 70 6e 67 0d 0a 43 |pe: image/png..C| 00000020 6f 6e 74 65 6e 74 2d 52 61 6e 67 65 3a 20 62 79 |ontent-Range: by| 00000030 74 65 73 20 36 34 2d 39 35 2f 37 30 32 39 0d 0a |tes 64-95/7029..| 00000040 0d 0a 2e 01 fd 9d 12 27 00 00 00 19 74 45 58 74 |.......'....tEXt| 00000050 53 6f 66 74 77 61 72 65 00 77 77 77 2e 69 6e 6b |Software.www.ink| 00000060 73 63 5f 6c 77 73 0d 0a 43 6f 6e 74 65 6e 74 2d |sc_lws..Content-| 00000070 54 79 70 65 3a 20 69 6d 61 67 65 2f 70 6e 67 0d |Type: image/png.| 00000080 0a 43 6f 6e 74 65 6e 74 2d 52 61 6e 67 65 3a 20 |.Content-Range: | 00000090 62 79 74 65 73 20 31 32 38 2d 31 34 33 2f 37 30 |bytes 128-143/70| 000000a0 32 39 0d 0a 0d 0a 05 14 50 40 05 15 a5 c4 60 43 |29......P@....`C| 000000b0 91 c4 4a d4 c4 fc 5f 6c 77 73 0d 00 |..J..._lws..| The corresponding header part is like this 0x0030: 4854 5450 2f31 2e31 2032 3036 HTTP/1.1.206 0x0040: 200d 0a73 6572 7665 723a 206c 7773 7773 ...server:.lwsws 0x0050: 0d0a 636f 6e74 656e 742d 7479 7065 3a20 ..content-type:. 0x0060: 6d75 6c74 6970 6172 742f 6279 7465 7261 multipart/bytera 0x0070: 6e67 6573 0d0a 6163 6365 7074 2d72 616e nges..accept-ran 0x0080: 6765 733a 2062 7974 6573 0d0a 636f 6e74 ges:.bytes..cont 0x0090: 656e 742d 6c65 6e67 7468 3a20 3138 380d ent-length:.188. 0x00a0: 0a63 6163 6865 2d63 6f6e 7472 6f6c 3a20 .cache-control:. 0x00b0: 7072 6976 6174 6520 6d61 782d 6167 653a private.max-age: 0x00c0: 2036 300d 0a63 6f6e 6e65 6374 696f 6e3a .60..connection: 0x00d0: 206b 6565 702d 616c 6976 650d 0a65 7461 .keep-alive..eta 0x00e0: 673a 2030 3030 3031 4237 3535 3444 3433 g:.00001B7554D43 0x00f0: 3033 330d 0a0d 0a 033....
2016-12-12 13:36:25 +08:00
message(" LWS_WITH_RANGES = ${LWS_WITH_RANGES}")
plat-optee and boringssl adaptations
2017-01-17 07:01:02 +08:00
message(" LWS_PLAT_OPTEE = ${LWS_PLAT_OPTEE}")
ESP32 platform This is enough for all the test app features to work on ESP32 without SSL.
2017-02-18 17:26:40 +08:00
message(" LWS_WITH_ESP32 = ${LWS_WITH_ESP32}")
junzip: style and migrate header into private-libwebsockets.h Also introduce CMake LWS_WITH_ZIP_FOPS defaulting to ON that builds junzip.c and make sure this is exported in lws_config.h (included by libwebsockets.h) Improve lws handling of stdint.h import or simulate it.
2017-03-03 09:19:14 +08:00
message(" LWS_WITH_ZIP_FOPS = ${LWS_WITH_ZIP_FOPS}")
CMake: add option to avoid GISPIPE IGN for Android 7+
2017-03-21 11:34:49 +08:00
message(" LWS_AVOID_SIGPIPE_IGN = ${LWS_AVOID_SIGPIPE_IGN}")
LWS_WITH_STATS
2017-05-07 10:02:03 +08:00
message(" LWS_WITH_STATS = ${LWS_WITH_STATS}")
client: added socks5 proxy support AG: - move creation info members to end of struct - add LWS_WITH_SOCKS5 CMake var, defaults to OFF - cast away some warnings about signed / unsigned in strncpy Signed-off-by: Andy Ning <andy.ning@windriver.com>
2017-05-05 11:38:34 -04:00
message(" LWS_WITH_SOCKS5 = ${LWS_WITH_SOCKS5}")
capabilities support
2017-06-07 06:10:02 +08:00
message(" LWS_HAVE_SYS_CAPABILITY_H = ${LWS_HAVE_SYS_CAPABILITY_H}")
message(" LWS_HAVE_LIBCAP = ${LWS_HAVE_LIBCAP}")
LWS_WITH_PEER_LIMITS Introduces an optional, settable restriction on the number of simultaneous wsi connections and ah that a single peer IP can obtain. The default is disabled for build, and if enabled, unlimited. However when enabled at CMake, setting info.ip_limit_ah and / or info.ip_limit_wsi at context creation time will enforce the limits. Connections past the info.ip_limit_wsi limit are dropped, and connections needing an ah are forced to stay in the ah waiting list even when ah are available, while the peer is at the number of ah in info.ip_limit_ah.
2017-09-14 13:14:11 +08:00
message(" LWS_WITH_PEER_LIMITS = ${LWS_WITH_PEER_LIMITS}")
win32: enable 64-bit file lengths https://github.com/warmcat/libwebsockets/issues/916 AG added more appveyor warning cleaning and stitched in cmake tests
2017-06-09 20:20:42 +08:00
message(" LWS_HAVE_ATOLL = ${LWS_HAVE_ATOLL}")
message(" LWS_HAVE__ATOI64 = ${LWS_HAVE__ATOI64}")
message(" LWS_HAVE_STAT32I64 = ${LWS_HAVE_STAT32I64}")
lws_intptr_t
2017-07-07 08:32:04 +08:00
message(" LWS_HAS_INTPTR_T = ${LWS_HAS_INTPTR_T}")
Add a flag to disable CMake exports Add LWS_EXPORT_LWSTARGETS (defaults to ON) that can be used to disable CMake export targets as well as install export for libwebsockets. AG: add _WITH_
2017-11-20 12:41:29 +01:00
message(" LWS_WITH_EXPORT_LWSTARGETS = ${LWS_WITH_EXPORT_LWSTARGETS}")
abstract: allow completely generic instantiation and destruction
2019-06-22 06:59:49 +01:00
message(" LWS_WITH_ABSTRACT = ${LWS_WITH_ABSTRACT}")
introduce urlencode decode and sql escape public apis This adds - simple lws_urlencode() - simple lws_urldecode() - simple lws_sql_purify Those expect the data to all be there and process it up until the first '\0'. There is also a larger opaque apis for handling POST_BODY urldecode. To enable these, you need to give cmake -DLWS_WITH_STATEFUL_URLDECODE=1 (or arrange any larger feature that relies on it sets that in CMakeLists.txt) - stateful urldecode with parameter array These have create / process / destroy semantics on a struct that maintains decode state. Stateful urldecode is capable of dealing with large POST data in multiple POST_BODY callbacks cleanly, eg, file transfer by POST. Stateful urldecode with parameter array wraps the above with a canned callback that stores the urldecoded data and indexes them in a pointer array matching an array of parameter names. You may also pass it an optional callback when creating it, that will recieve uploaded file content. The test html is updated to support both urlencoded and multipart forms, with some javascript to do clientside validation of an arbitrary 100KB file size limit (there is no file size limit in the apis). Signed-off-by: Andy Green <andy@warmcat.com>
2016-06-08 10:07:02 +08:00
cmake and other fixes
2014-02-15 13:48:56 +08:00
message("---------------------------------------------------------------------")
# These will be available to parent projects including libwebsockets using add_subdirectory()
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
set(LIBWEBSOCKETS_LIBRARIES ${LWS_LIBRARIES} CACHE STRING "Libwebsocket libraries")
if (LWS_WITH_STATIC)
Subject: Fixed value of LIBWEBSOCKETS_LIBRARIES_STATIC
2017-05-29 21:44:01 +03:00
set(LIBWEBSOCKETS_LIBRARIES_STATIC websockets CACHE STRING "Libwebsocket static library")
Subject: [PATCH] Multiple changes in the build process * Default CMAKE_BUILD_TYPE to Release * Use CMAKE_BUILD_TYPE to define _DEBUG (NDEBUG is more standard though, but cmake defines it) * Drop LWS_WITHOUT_DEBUG (use CMAKE_BUILD_TYPE for that) * Drop LWS_NO_EXTERNAL_POLL (was not used) * Drop CMAKE_BUILD (CMake is the only build system now) * Add LWS_WITH_STATIC and LWS_WITH_SHARED to choose what version(s) to build * Add LWS_XXX_LIBRARIES and LWS_XXX_INCLUDE_DIRS for each library dependency (zlib, openssl, libev, cyassl) * Support setting of XXX_LIBRARIES, XXX_LIBRARIES and XXX_INCLUDE_DIRS by parent project (when included with add_subdirectory()) * Rename LWS_USE_EXTERNAL_ZLIB to LWS_USE_BUNDLED_ZLIB and default it to NO (since it's Windows only) * Default LWS_WITHOUT_DAEMONIZE to NO (since network lib shouldn't know how to do it anyway) * Rename config.h.cmake to lws_config.h.in * Rename shared library to websockets_shared so linker will not be confused * Fix inline keyword detection in clang * Explicitly set MACOSX_RPATH to YES on MacOS
2015-04-22 10:52:13 -07:00
endif()
if (LWS_WITH_SHARED)
set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library")
endif()
cmake use existing spec file for RPM generation Signed-off-by: Tomas Cejka <cejkat@cesnet.cz>
2013-04-11 08:13:13 +08:00
LWS_WITH_MINIMAL_EXAMPLES: default-off build all minimal samples after lws for QA This adds an lws cmake option that builds all the minimal examples as part of lws, it's useful for QA. It adds a macro to examples that depend on a particular lws configuration to understand they should just null out their project definition in builds where the lws configuration requirement is not met, and we are building as part of lws. It also adapts all the example library additions to select the just-built-but-not-yet-installed library in the case it is built as part of lws. If built standalone, it now uses the cmake platform-abstracted way to add the library requirement too.
2018-03-17 06:43:12 +08:00
if (LWS_WITH_MINIMAL_EXAMPLES)
MACRO(SUBDIRLIST result curdir)
FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)
SET(dirlist "")
FOREACH(child ${children})
IF(IS_DIRECTORY ${curdir}/${child})
LIST(APPEND dirlist ${child})
ENDIF()
ENDFOREACH()
SET(${result} ${dirlist})
ENDMACRO()
SUBDIRLIST(SUBDIRS "${PROJECT_SOURCE_DIR}/minimal-examples")
FOREACH(subdir ${SUBDIRS})
SUBDIRLIST(SUBDIRS2 "${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}")
FOREACH(subdir2 ${SUBDIRS2})
if (EXISTS "${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}/${subdir2}/CMakeLists.txt")
message("Processing ${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}/${subdir2}")
add_subdirectory("${PROJECT_SOURCE_DIR}/minimal-examples/${subdir}/${subdir2}")
endif()
ENDFOREACH()
ENDFOREACH()
ENDIF()
Added CPack support + some more. - "make dist" will now produce a tar.gz file. This includes everything (not really what we want but a start). - Got rid of a bunch of defines and variables that aren't used. - Added the option LINK_TESTAPPS_DYNAMIC that enables linking to the shared library version of the lib for the test apps, instead of doing it statically like the default is. - Fixed proper support for the --prefix stuff (-DCMAKE_INSTALL_PREFIX for cmake). (Don't specify /usr/local explicitly, that is the default anyway and will break other platforms). - Note: I noticed a problem with the "INSTALL_DATADIR" define used by the test-apps. Since we hard code the path to the certs using this, doing "DESTDIR=/bla make install" will result in not being able to use the SSL mode for the test-apps since they won't find the certs. (This also applies to the autoconf project). Fixed this by setting "../share" as the default location instead of using the prefix.
2013-02-22 09:28:08 +08:00
# This must always be last!
include(CPack)
Reference in a new issue Copy permalink