[socket-io-client] Update to latest commit (#26421)

* [socket-io-client] Update to latest commit

* x-add-version

* apply suggestion

* x-add-version
This commit is contained in:
Lily Wang 2022-08-19 13:40:12 -07:00 committed by GitHub
parent ad64f05e39
commit 6e2d5acac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 57 deletions

View File

@ -1,49 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,20 +31,24 @@ add_definitions(
-D_WEBSOCKETPP_CPP11_FUNCTIONAL_
)
+find_package(websocketpp CONFIG REQUIRED)
+find_package(asio CONFIG REQUIRED)
+find_package(RapidJSON CONFIG REQUIRED)
+
add_library(sioclient ${ALL_SRC})
target_include_directories(sioclient PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src
- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp
- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
- ${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,16 +59,13 @@ if(OPENSSL_FOUND)
add_library(sioclient_tls ${ALL_SRC})
target_include_directories(sioclient_tls PRIVATE
${CMAKE_CURRENT_LIST_DIR}/src
- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp
- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include
${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)
else()
set_property(TARGET sioclient_tls APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11")
endif()

View File

@ -3,18 +3,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO socketio/socket.io-client-cpp
REF 3.1.0
SHA512 a0adaa06ddb24297686a40b1e71a55bbab437093f828f76040c376b4adccb7d8b06eff4d8569dbde9b2e071257b3290e7e2bffd6354b33ecf67378ffa1d0cc13
REF dbb4547d3160368feaaf55c3338ad085a8f968b8
SHA512 cbb2a4742d16ba9ee72ca49a56605690ed620c978f51012e0d655a86b110a557b196ffc55af8b0440c1d7cd76d9dffe6f85abd0af300095608434eb9394dc68b
HEAD_REF master
PATCHES
fix-file-not-found.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DUSE_SUBMODULES=OFF
-DCMAKE_INSTALL_INCLUDEDIR=include
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME sioclient CONFIG_PATH lib/cmake/sioclient)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/sioclient/sioclientConfig.cmake"
"include(CMakeFindDependencyMacro)"
[[include(CMakeFindDependencyMacro)
find_dependency(websocketpp CONFIG)
find_dependency(asio CONFIG)
find_dependency(RapidJSON CONFIG)
find_dependency(OpenSSL)]])
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,7 +1,6 @@
{
"name": "socket-io-client",
"version": "3.1.0",
"port-version": 1,
"version-date": "2022-08-19",
"description": "C++11 implementation of Socket.IO client",
"homepage": "https://github.com/socketio/socket.io-client-cpp",
"license": "MIT",
@ -12,6 +11,10 @@
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"websocketpp"
]
}

View File

@ -6717,8 +6717,8 @@
"port-version": 0
},
"socket-io-client": {
"baseline": "3.1.0",
"port-version": 1
"baseline": "2022-08-19",
"port-version": 0
},
"sockpp": {
"baseline": "0.7.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f4f6bebb98623c2bf8602d7538ae4c1d7de6c0ad",
"version-date": "2022-08-19",
"port-version": 0
},
{
"git-tree": "f31e0afc883eef287abf9b7914563cd10b331b86",
"version": "3.1.0",