From 22eefc7590bae5213d82e2dfd10b1567d534f0ee Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 23 Nov 2018 20:53:53 +0200 Subject: [PATCH] websockets: fix proken detection of libwebsockets --- include/villas/config.h.in | 2 +- lib/nodes/CMakeLists.txt | 4 ++-- lib/web.c | 4 ++-- src/villas-pipe.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/villas/config.h.in b/include/villas/config.h.in index a20cbf3f2..587c45dd9 100644 --- a/include/villas/config.h.in +++ b/include/villas/config.h.in @@ -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 diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt index 81a4a0705..9b8075ed1 100644 --- a/lib/nodes/CMakeLists.txt +++ b/lib/nodes/CMakeLists.txt @@ -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 diff --git a/lib/web.c b/lib/web.c index 5861d7ff6..4194537ef 100644 --- a/lib/web.c +++ b/lib/web.c @@ -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", diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp index 39733ba19..4889c204a 100644 --- a/src/villas-pipe.cpp +++ b/src/villas-pipe.cpp @@ -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);