updated conan dependency versions and wsclient.h fix
This commit is contained in:
@@ -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.
|
||||
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user