Skip to content

Only add targets to LIBWEBSOCKETS_LIBRARIES when they exist #3567

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
hmenke wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −6
Open

Only add targets to LIBWEBSOCKETS_LIBRARIES when they exist #3567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b99f856
testsfail: blow up on mac
lws-team Apr 7, 2026
ba8e0c7
Only add targets to LIBWEBSOCKETS_LIBRARIES when they exist
hmenke Apr 8, 2026
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
8 changes: 7 additions & 1 deletion cmake/libwebsockets-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ endif()
include(${LWS_CMAKE_DIR}/LwsCheckRequirements.cmake)

# IMPORTED targets from LibwebsocketsTargets.cmake
set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)
set(LIBWEBSOCKETS_LIBRARIES)
if (TARGET websockets)
set(LIBWEBSOCKETS_LIBRARIES ${LIBWEBSOCKETS_LIBRARIES} websockets)
endif()
if (TARGET websockets_shared)
set(LIBWEBSOCKETS_LIBRARIES ${LIBWEBSOCKETS_LIBRARIES} websockets_shared)
endif()

if (TARGET websockets_shared)
set(websockets_shared 1)
Expand Down
1 change: 1 addition & 0 deletions lib/secure-streams/serialized/client/sspc-transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ lws_sspc_txp_event_closed(lws_transport_priv_t priv)
r = h->ssi.state(ss_to_userobj(h), NULL,
LWSSSCS_DISCONNECTED, 0);
}
h->creating_cb_done = 0;
if (r != LWSSSSRET_DESTROY_ME)
/*
* schedule a reconnect in 1s
Expand Down
11 changes: 6 additions & 5 deletions ...wlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ static const char * const default_ss_policy =
"\"tls\": true,"
"\"nghttp2_quirk_end_stream\": true,"
"\"h2q_oflow_txcr\": true,"
"\"timeout_ms\": 3000,"
"\"timeout_ms\": 5000,"
"\"retry\": \"default\","
"\"tls_trust_store\": \"le_via_isrg\""
"}}"
Expand Down Expand Up @@ -591,19 +591,19 @@ struct tests_seq {

{
"h1:badcert_hostname",
"badcert_hostname", 6 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
"badcert_hostname", 35 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
(1 << LWSSSCS_QOS_NACK_REMOTE),
0
},
{
"h1:badcert_expired",
"badcert_expired", 6 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
"badcert_expired", 35 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
(1 << LWSSSCS_QOS_NACK_REMOTE),
0
},
{
"h1:badcert_selfsigned",
"badcert_selfsigned", 6 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
"badcert_selfsigned", 35 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
(1 << LWSSSCS_QOS_NACK_REMOTE),
0
},
Expand Down Expand Up @@ -737,7 +737,8 @@ myss_state(void *userobj, void *sh, lws_ss_constate_t state,
case LWSSSCS_CONNECTING:
case LWSSSCS_CREATING:
if (state == LWSSSCS_CREATING) {
m->start_us = lws_now_usecs();
if (!m->start_us)
m->start_us = lws_now_usecs();
lws_ss_start_timeout(m->ss,
(unsigned int)(curr_test->timeout_us / LWS_US_PER_MS));
} else {
Expand Down