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

Merge branch 'cmake_config' of github.com:JoakimSoderberg/libwebsockets into cmake_config

Browse source
This commit is contained in:
Joakim Soderberg 2014-01-14 15:33:50 +01:00
commit 320da42a60
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -752,6 +752,7 @@ export(PACKAGE libwebsockets)
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)
@ -849,5 +850,10 @@ message(" LWS_WITH_LATENCY = ${LWS_WITH_LATENCY}")
message(" LWS_WITHOUT_DAEMONIZE = ${LWS_WITHOUT_DAEMONIZE}")
message("---------------------------------------------------------------------")
# These will be available to parent projects including libwebsockets using add_subdirectory()
set(LIBWEBSOCKETS_LIBRARIES websocket websockets_shared CACHE STRING "Libwebsocket libraries")
set(LIBWEBSOCKETS_LIBRARIES_STATIC websocket CACHE STRING "Libwebsocket static library")
set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library")
# This must always be last!
include(CPack)

2
lib/libwebsockets.h
View file

@ -65,7 +65,9 @@ typedef SSIZE_T ssize_t;
#else // NOT WIN32
/* to get ppoll() */
#ifndef __USE_GNU
#define __USE_GNU
#endif
#include <poll.h>
#include <unistd.h>