Skip to content

Linux: gate WSC source files and zlib system deps on HC_NOWEBSOCKETS/HC_NOZLIB #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v-patrickpe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Linux: gate WSC source files and zlib system deps on HC_NOWEBSOCKETS/HC_NOZLIB #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Build/libHttpClient.Linux/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,16 @@ set(LINUX_SOURCE_FILES
"${PATH_TO_ROOT}/Source/Platform/Linux/PlatformComponents_Linux.cpp"
"${PATH_TO_ROOT}/Source/Task/ThreadPool_stl.cpp"
"${PATH_TO_ROOT}/Source/Task/WaitTimer_stl.cpp"
"${PATH_TO_ROOT}/Source/WebSocket/Websocketpp/websocketpp_websocket.cpp"
"${PATH_TO_ROOT}/Source/WebSocket/Websocketpp/websocketpp_websocket.h"
"${PATH_TO_ROOT}/Source/WebSocket/Websocketpp/x509_cert_utilities.hpp"
)

if (NOT DEFINED HC_NOWEBSOCKETS)
list(APPEND LINUX_SOURCE_FILES
"${PATH_TO_ROOT}/Source/WebSocket/Websocketpp/websocketpp_websocket.cpp"
"${PATH_TO_ROOT}/Source/WebSocket/Websocketpp/websocketpp_websocket.h"
"${PATH_TO_ROOT}/Source/WebSocket/Websocketpp/x509_cert_utilities.hpp"
)
endif()

if (NOT DEFINED HC_NOZLIB)
set(ZLIB_SOURCE_FILES
"${PATH_TO_ROOT}/External/zlib/adler32.c"
Expand Down
9 changes: 8 additions & 1 deletion Build/libHttpClient.Linux/install_dependencies.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,14 @@ done
set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters

build_dependencies=(clang make autoconf automake libtool)
library_dependencies=(zlib1g zlib1g-dev)
library_dependencies=()

# zlib is only needed when zlib support is enabled (default on) AND websockets are enabled,
# since WebSocket Compression (HC_ENABLE_WEBSOCKET_COMPRESSION, default ON) depends on zlib.
# Consumers that opt out via HC_NOZLIB=true or HC_NOWEBSOCKETS=true do not need zlib system packages.
if [ "${HC_NOZLIB}" != "true" ] && [ "${HC_NOWEBSOCKETS}" != "true" ]; then
library_dependencies+=(zlib1g zlib1g-dev)
fi

if [ "$DO_INSTALL" = false ]; then

Expand Down