|
|
|
|
@ -1,42 +1,28 @@
|
|
|
|
|
Index: CMakeLists.txt
|
|
|
|
|
--- CMakeLists.txt.orig 2015-08-15 20:52:06.000000000 +0200
|
|
|
|
|
+++ CMakeLists.txt 2015-08-15 21:11:41.553417678 +0200
|
|
|
|
|
@@ -431,25 +431,6 @@
|
|
|
|
|
list(APPEND LWS_LIBRARIES websockets_shared)
|
|
|
|
|
endif()
|
|
|
|
|
--- CMakeLists.txt.orig 2016-02-20 02:20:36.000000000 +0100
|
|
|
|
|
+++ CMakeLists.txt 2016-02-20 10:24:57.752575245 +0100
|
|
|
|
|
@@ -510,9 +510,9 @@
|
|
|
|
|
set(VISIBILITY_FLAG -fvisibility=hidden)
|
|
|
|
|
endif()
|
|
|
|
|
if (UNIX)
|
|
|
|
|
- set(CMAKE_C_FLAGS "-Wall -Werror ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
|
|
|
|
|
+ set(CMAKE_C_FLAGS "${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
|
|
|
|
|
else(UNIX)
|
|
|
|
|
- set(CMAKE_C_FLAGS "-Wall ${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
|
|
|
|
|
+ set(CMAKE_C_FLAGS "${VISIBILITY_FLAG} ${CMAKE_C_FLAGS}" )
|
|
|
|
|
endif(UNIX)
|
|
|
|
|
endif ()
|
|
|
|
|
|
|
|
|
|
-if (WIN32)
|
|
|
|
|
- if (LWS_WITH_SHARED)
|
|
|
|
|
- # Compile as DLL (export function declarations)
|
|
|
|
|
- set_property(
|
|
|
|
|
- TARGET websockets_shared
|
|
|
|
|
- PROPERTY COMPILE_DEFINITIONS
|
|
|
|
|
- LWS_DLL
|
|
|
|
|
- LWS_INTERNAL)
|
|
|
|
|
- endif()
|
|
|
|
|
-elseif(APPLE)
|
|
|
|
|
- if (LWS_WITH_SHARED)
|
|
|
|
|
- set_property(TARGET websockets_shared PROPERTY MACOSX_RPATH YES)
|
|
|
|
|
- endif()
|
|
|
|
|
-else()
|
|
|
|
|
- set_target_properties(websockets_shared
|
|
|
|
|
- PROPERTIES
|
|
|
|
|
- OUTPUT_NAME websockets)
|
|
|
|
|
-endif()
|
|
|
|
|
-
|
|
|
|
|
# Set the so version of the lib.
|
|
|
|
|
# Equivalent to LDFLAGS=-version-info x:x:x
|
|
|
|
|
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
|
|
|
@@ -828,7 +809,7 @@
|
|
|
|
|
@@ -1044,7 +1044,7 @@
|
|
|
|
|
Description: Websockets server and client library
|
|
|
|
|
Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
|
|
|
|
|
Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
|
|
|
|
|
|
|
|
|
|
-Libs: -L\${libdir} -lwebsockets
|
|
|
|
|
+Libs: -L\${libdir} -lwebsockets -lssl -lcrypto -lz
|
|
|
|
|
Cflags: -I\${includedir}"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@@ -851,7 +832,6 @@
|
|
|
|
|
@@ -1067,7 +1067,6 @@
|
|
|
|
|
# Export targets (This is used for other CMake projects to easily find the libraries and include files).
|
|
|
|
|
export(TARGETS ${LWS_LIBRARIES}
|
|
|
|
|
FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake")
|
|
|
|
|
@ -44,16 +30,3 @@ Index: CMakeLists.txt
|
|
|
|
|
|
|
|
|
|
# Generate the config file for the build-tree.
|
|
|
|
|
set(LWS__INCLUDE_DIRS
|
|
|
|
|
Index: lws_config.h.in
|
|
|
|
|
--- lws_config.h.in.orig 2015-08-15 20:52:06.000000000 +0200
|
|
|
|
|
+++ lws_config.h.in 2015-08-15 21:10:23.464374867 +0200
|
|
|
|
|
@@ -148,9 +148,6 @@
|
|
|
|
|
*/
|
|
|
|
|
#undef LT_OBJDIR // We're not using libtool
|
|
|
|
|
|
|
|
|
|
-/* Version number of package */
|
|
|
|
|
-#cmakedefine VERSION
|
|
|
|
|
-
|
|
|
|
|
/* Define to rpl_malloc if the replacement function should be used. */
|
|
|
|
|
#cmakedefine malloc
|
|
|
|
|
|
|
|
|
|
|
