[socket-io-client] Update to 3.1.0 (#20883)

* Update socket-io-client to 3.1.0

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
chausner 2021-10-27 08:34:56 +02:00 committed by GitHub
parent 39bbc76bfa
commit 9d45ae9d87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 33 deletions

View File

@ -1,13 +0,0 @@
diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp
index f78aea4..6780e26 100644
--- a/src/internal/sio_client_impl.cpp
+++ b/src/internal/sio_client_impl.cpp
@@ -286,7 +286,7 @@ namespace sio
if(ec || m_con.expired())
{
if (ec != asio::error::operation_aborted)
- LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl){};
+ LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl);
return;
}
packet p(packet::frame_ping);

View File

@ -1,8 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19c5e54..9d2e1ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,17 +31,20 @@ add_definitions(
@@ -31,20 +31,24 @@ add_definitions(
-D_WEBSOCKETPP_CPP11_FUNCTIONAL_
)
@ -18,15 +17,19 @@ index 19c5e54..9d2e1ec 100644
- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include
)
if (CMAKE_VERSION VERSION_GREATER "3.1")
set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
else()
set_property(TARGET sioclient APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11")
endif()
+
+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson)
+
if(BUILD_SHARED_LIBS)
set_target_properties(sioclient
PROPERTIES
@@ -56,15 +59,12 @@ if(OPENSSL_FOUND)
@@ -56,16 +59,13 @@ if(OPENSSL_FOUND)
add_library(sioclient_tls ${ALL_SRC})
target_include_directories(sioclient_tls PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src
@ -36,10 +39,11 @@ index 19c5e54..9d2e1ec 100644
${OPENSSL_INCLUDE_DIR}
)
if (CMAKE_VERSION VERSION_GREATER "3.1")
set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11)
set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} )
+target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} websocketpp::websocketpp asio asio::asio rapidjson)
target_compile_definitions(sioclient_tls PRIVATE -DSIO_TLS)
if(BUILD_SHARED_LIBS)
set_target_properties(sioclient_tls
else()
set_property(TARGET sioclient_tls APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11")
endif()

View File

@ -3,21 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO socketio/socket.io-client-cpp
REF 3.0.0
SHA512 42735d73d24546b37332d649a2633f4a1b6e004b016c45d53bd8e230a157753bb319c80a59721865b9c3dcc588b4eec3cdf4ae9f7fc2cdf290b6bb07c866552c
REF 3.1.0
SHA512 a0adaa06ddb24297686a40b1e71a55bbab437093f828f76040c376b4adccb7d8b06eff4d8569dbde9b2e071257b3290e7e2bffd6354b33ecf67378ffa1d0cc13
HEAD_REF master
PATCHES
fix-file-not-found.patch
fix-error-C3321.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
)
vcpkg_install_cmake()
vcpkg_cmake_install()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,12 +1,16 @@
{
"name": "socket-io-client",
"version": "3.0.0",
"port-version": 1,
"version": "3.1.0",
"description": "C++11 implementation of Socket.IO client",
"homepage": "https://github.com/socketio/socket.io-client-cpp",
"supports": "static",
"dependencies": [
"asio",
"rapidjson",
{
"name": "vcpkg-cmake",
"host": true
},
"websocketpp"
]
}

View File

@ -6265,8 +6265,8 @@
"port-version": 0
},
"socket-io-client": {
"baseline": "3.0.0",
"port-version": 1
"baseline": "3.1.0",
"port-version": 0
},
"sockpp": {
"baseline": "0.7",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3844cb4dc084c2fe9ddd4a15a77d0c06e391c744",
"version": "3.1.0",
"port-version": 0
},
{
"git-tree": "fb9a92d56d3208354e66f4a449698af2e2d2fd2f",
"version": "3.0.0",