From a587dee12666d96aa69d234efe0bd96f26d93eee Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 30 May 2024 16:20:01 +0200 Subject: [PATCH 1/3] Allow newer Cmake versions Signed-off-by: Uilian Ries --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72846e72..a898bbd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12...3.27 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12...3.27) PROJECT(sioclient VERSION 3.1.0 From e11e70c058a994ea87ba5f213e09baa3620f94f2 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 30 May 2024 16:22:16 +0200 Subject: [PATCH 2/3] comsume only asio cmake target Signed-off-by: Uilian Ries --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a898bbd2..150cc331 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ else() find_package(websocketpp CONFIG REQUIRED) find_package(asio CONFIG REQUIRED) find_package(RapidJSON CONFIG REQUIRED) - target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson) + target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio::asio rapidjson) endif() include(GNUInstallDirs) From 8dab9331d14400fad260096d7a7ffd5d3823a7f5 Mon Sep 17 00:00:00 2001 From: Uilian Ries Date: Thu, 30 May 2024 16:37:32 +0200 Subject: [PATCH 3/3] Add Conan support in docs Signed-off-by: Uilian Ries --- INSTALL.md | 11 +++++++++++ README.md | 1 + 2 files changed, 12 insertions(+) diff --git a/INSTALL.md b/INSTALL.md index 77069709..dfd16ef1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -26,3 +26,14 @@ vcpkg install socket-io-client ``` The Socket.IO client port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository. + +### With Conan + +You can install pre-built binaries for Socket.IO C++ client or build it from source using [Conan](https://conan.io/). Use the following command: + +``` +conan install --requires="sioclient/[*]" --build=missing +``` + +The Socket.IO client Conan recipe is kept up to date by Conan maintainers and community contributors. +If the version is out of date, please [create an issue or pull request](https://github.com/conan-io/conan-center-index) on the ConanCenterIndex repository. diff --git a/README.md b/README.md index 63a78041..3b093973 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ Note: Only the WebSocket transport is currently implemented (no fallback to HTTP * [With CMAKE](./INSTALL.md#with-cmake) * [Without CMAKE](./INSTALL.md#without-cmake) * [With VCPKG](./INSTALL.md#with-vcpkg) +* [With Conan](./INSTALL.md#with-conan) * [iOS and OS X](./INSTALL_IOS.md) * Option 1: Cocoapods * Option 2: Create a static library