From fb12ba5c187177d78a2298b04818740cafa94727 Mon Sep 17 00:00:00 2001 From: ydcpp Date: Mon, 22 Apr 2024 12:02:33 +0300 Subject: [PATCH] updated conan dependency versions and wsclient.h fix --- docs/conan.md | 6 +++--- kubernetes/conanfile.py | 13 ++++--------- kubernetes/websocket/wsclient.h | 4 ++-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/docs/conan.md b/docs/conan.md index a07b66b..7dbc35b 100644 --- a/docs/conan.md +++ b/docs/conan.md @@ -1,5 +1,5 @@ # Installing using conan -### Prerequisites +## Prerequisites 1- Python 3 https://www.python.org/downloads/ @@ -7,7 +7,7 @@ https://www.python.org/downloads/ https://docs.conan.io/2/installation.html ## Build and Install the repo to local system by using conan -1- Navigate to `kubernetes` directory, then use `conan create .` command. This will build the repo from source as static library. +1- Navigate to `kubernetes` directory, then use `conan create` command. This will build the repo from source as static library. ``` cd kubernetes conan create . --build=missing @@ -55,7 +55,7 @@ class ExampleRecipe(ConanFile): conan install . --build=missing ``` -3- Finally, edit your `CMakeLists.txt` of your project to link against libraries. In this case, we link to `kubernetes_client_c` library. +3- Finally, edit `CMakeLists.txt` of your project to link against libraries. In this case, we link to `kubernetes_client_c` library. Add these lines after declaring the target in CMakeLists. diff --git a/kubernetes/conanfile.py b/kubernetes/conanfile.py index a5a0d46..8c1233b 100644 --- a/kubernetes/conanfile.py +++ b/kubernetes/conanfile.py @@ -59,12 +59,7 @@ class kubernetes_client_cRecipe(ConanFile): self.cpp_info.libs = ["kubernetes"] def requirements(self): - self.requires("libcurl/[^7.58]", headers=True, libs=True, transitive_headers=True) - self.requires("openssl/[~1.1]", headers=True, libs=True, transitive_headers=True) - self.requires("libwebsockets/4.2.0", headers=True, libs=True, transitive_headers=True) - self.requires("libyaml/0.2.5", headers=True, libs=True, transitive_headers=True) - - - - - + self.requires("libcurl/[^8]", transitive_headers=True) + self.requires("openssl/[~1.1]") + self.requires("libwebsockets/4.2.0", transitive_headers=True) + self.requires("libyaml/0.2.5") diff --git a/kubernetes/websocket/wsclient.h b/kubernetes/websocket/wsclient.h index b2d322c..5684f29 100644 --- a/kubernetes/websocket/wsclient.h +++ b/kubernetes/websocket/wsclient.h @@ -8,7 +8,7 @@ extern "C" { #endif -typedef void (*data_callback_func) (void **, long *); +typedef void (*data_callback_function) (void **, long *); typedef enum wsc_mode_t { WSC_MODE_NORMAL = 0, @@ -23,7 +23,7 @@ typedef struct wsclient_t { long data_to_send_len; void *data_received; long data_received_len; - data_callback_func data_callback_func; + data_callback_function data_callback_func; int log_mask; lws_sorted_usec_list_t sul; /* schedule connection retry */ struct lws *wsi; /* related wsi if any */