mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[socket-io-client]fix socket-io-client use (#18768)
* update patch file * update version
This commit is contained in:
parent
959e4c61cd
commit
a1225b69e0
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 19c5e54..ca8a00d 100644
|
||||
index 19c5e54..9d2e1ec 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -31,16 +31,20 @@ add_definitions(
|
||||
@@ -31,17 +31,20 @@ add_definitions(
|
||||
-D_WEBSOCKETPP_CPP11_FUNCTIONAL_
|
||||
)
|
||||
|
||||
@ -20,13 +20,13 @@ index 19c5e54..ca8a00d 100644
|
||||
|
||||
set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
|
||||
set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp)
|
||||
+target_link_libraries(sioclient PRIVATE asio asio::asio)
|
||||
+target_link_libraries(sioclient PRIVATE rapidjson)
|
||||
|
||||
+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson)
|
||||
+
|
||||
if(BUILD_SHARED_LIBS)
|
||||
set_target_properties(sioclient
|
||||
@@ -56,9 +60,6 @@ if(OPENSSL_FOUND)
|
||||
PROPERTIES
|
||||
@@ -56,15 +59,12 @@ if(OPENSSL_FOUND)
|
||||
add_library(sioclient_tls ${ALL_SRC})
|
||||
target_include_directories(sioclient_tls PRIVATE
|
||||
${CMAKE_CURRENT_LIST_DIR}/src
|
||||
@ -36,3 +36,10 @@ index 19c5e54..ca8a00d 100644
|
||||
${OPENSSL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
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
|
||||
|
@ -11,8 +11,6 @@ vcpkg_from_github(
|
||||
fix-error-C3321.patch
|
||||
)
|
||||
|
||||
file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzstd.cmake")
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "socket-io-client",
|
||||
"version": "3.0.0",
|
||||
"port-version": 1,
|
||||
"description": "C++11 implementation of Socket.IO client",
|
||||
"homepage": "https://github.com/socketio/socket.io-client-cpp",
|
||||
"dependencies": [
|
||||
|
@ -5850,7 +5850,7 @@
|
||||
},
|
||||
"socket-io-client": {
|
||||
"baseline": "3.0.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"sockpp": {
|
||||
"baseline": "0.7",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "fb9a92d56d3208354e66f4a449698af2e2d2fd2f",
|
||||
"version": "3.0.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "a84a0e4ab231050bf881b44603070de5da27ae05",
|
||||
"version": "3.0.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user