Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
e9882b74c7 |
@ -1,10 +1,6 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
All changes to this project will be documented in this file.
|
All changes to this project will be documented in this file.
|
||||||
|
|
||||||
## [9.6.4] - 2020-05-20
|
|
||||||
|
|
||||||
(compiler fix) support clang 5 and earlier (contributed by @LunarWatcher)
|
|
||||||
|
|
||||||
## [9.6.3] - 2020-05-18
|
## [9.6.3] - 2020-05-18
|
||||||
|
|
||||||
(cmake) revert CMake changes to fix #203 and be able to use an external OpenSSL
|
(cmake) revert CMake changes to fix #203 and be able to use an external OpenSSL
|
||||||
|
@ -42,19 +42,6 @@ It is possible to get IXWebSocket through Microsoft [vcpkg](https://github.com/m
|
|||||||
```
|
```
|
||||||
vcpkg install ixwebsocket
|
vcpkg install ixwebsocket
|
||||||
```
|
```
|
||||||
To use the installed package within a cmake project, use the following:
|
|
||||||
```cmake
|
|
||||||
set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") # this is super important in order for cmake to include the vcpkg search/lib paths!
|
|
||||||
|
|
||||||
# find library and its headers
|
|
||||||
find_path(IXWEBSOCKET_INCLUDE_DIR ixwebsocket/IXWebSocket.h)
|
|
||||||
find_library(IXWEBSOCKET_LIBRARY ixwebsocket)
|
|
||||||
# include headers
|
|
||||||
include_directories(${IXWEBSOCKET_INCLUDE_DIR})
|
|
||||||
# ...
|
|
||||||
target_link_libraries(${PROJECT_NAME} ... ${IXWEBSOCKET_LIBRARY}) # Cmake will automatically fail the generation if the lib was not found, i.e is set to NOTFOUNS
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
### Conan
|
### Conan
|
||||||
|
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <cstdlib>
|
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
@ -6,4 +6,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define IX_WEBSOCKET_VERSION "9.6.4"
|
#define IX_WEBSOCKET_VERSION "9.6.3"
|
||||||
|
Reference in New Issue
Block a user