Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

websockets: fix proken detection of libwebsockets

Browse source
This commit is contained in:
Steffen Vogel 2018-11-23 20:53:53 +02:00
parent b21227bb3b
commit 22eefc7590
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/villas/config.h.in
View file

@ -82,7 +82,7 @@ extern "C" {
#cmakedefine HAS_SEMAPHORE
#cmakedefine Libwebsockets_FOUND
#cmakedefine LIBWEBSOCKETS_FOUND
#cmakedefine HDF5_FOUND
#cmakedefine PROTOBUF_FOUND
#cmakedefine LIBNL3_ROUTE_FOUND

4
lib/nodes/CMakeLists.txt
View file

@ -91,10 +91,10 @@ if(CURL_FOUND)
endif()
# Enable WebSocket support
if(Libwebsockets_FOUND AND WITH_WEB AND WITH_IO)
if(LIBWEBSOCKETS_FOUND AND WITH_WEB AND WITH_IO)
list(APPEND NODE_SRC websocket.c)
list(APPEND INCLUDE_DIRS ${LIBWEBSOCKETS_INCLUDE_DIRS})
list(APPEND LIBRARIES websockets_shared)
list(APPEND LIBRARIES ${LIBWEBSOCKETS_LDLIBS})
endif()
# Enable AMQP support

4
lib/web.c
View file

@ -58,14 +58,14 @@ lws_callback_function websocket_protocol_cb;
.rx_buffer_size = 0
},
#endif /* WITH_API */
#ifdef Libwebsockets_FOUND
#ifdef LIBWEBSOCKETS_FOUND
{
.name = "live",
.callback = websocket_protocol_cb,
.per_session_data_size = sizeof(struct websocket_connection),
.rx_buffer_size = 0
},
#endif /* Libwebsockets_FOUND */
#endif /* LIBWEBSOCKETS_FOUND */
#if 0 /* not supported yet */
{
.name = "log",

4
src/villas-pipe.cpp
View file

@ -360,7 +360,7 @@ check: if (optarg == endptr)
if (!node)
error("Node %s does not exist!", nodestr);
#ifdef Libwebsockets_FOUND
#ifdef LIBWEBSOCKETS_FOUND
/* Only start web subsystem if villas-pipe is used with a websocket node */
if (node->_vt->start == websocket_start) {
ret = web_start(&sn.web);
@ -371,7 +371,7 @@ check: if (optarg == endptr)
if (ret)
error("Failed to start API subsystem");
}
#endif /* Libwebsockets_FOUND */
#endif /* LIBWEBSOCKETS_FOUND */
if (reverse)
node_reverse(node);