Skip to content

Commit 9c7b114

Browse files
authored
Merge pull request #80 from ahmedyarub/ay/windows_installation_adaptaions2
Windows adaptations and installation configuration
2 parents 1d433b7 + 6b98698 commit 9c7b114

File tree

114 files changed

+2414
-1326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2414
-1326
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
cd libyaml
3333
mkdir build
3434
cd build
35-
cmake .. -DBUILD_TESTING=OFF
35+
cmake .. -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON
3636
make -j $(cat /proc/cpuinfo | grep processor | wc -l)
3737
sudo make install
3838
- name: Build client library

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ git clone https://github.com/yaml/libyaml --depth 1 --branch release/0.2.5
3131
cd libyaml
3232
mkdir build
3333
cd build
34-
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DBUILD_TESTING=OFF ..
34+
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON ..
3535
make
3636
sudo make install
3737

examples/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
cmake_minimum_required (VERSION 2.6...3.10.2)
2+
project(examples)
3+
14
set(pkgName "kubernetes")
25

36
add_subdirectory(list_pod)

examples/list_pod/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
add_executable(list_pod main.c)
2-
3-
find_package(${pkgName})
1+
find_package(${pkgName} CONFIG REQUIRED COMPONENTS ${pkgName})
42

5-
target_link_libraries(list_pod PRIVATE ${pkgName})
3+
add_executable(list_pod main.c)
4+
target_link_libraries(list_pod PRIVATE ${pkgName}::${pkgName})

examples/list_pod/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
INCLUDE:=-I../../kubernetes/include -I../../kubernetes/model -I../../kubernetes/api -I../../kubernetes/config
2-
LIBS:=-L../../kubernetes/build -lkubernetes -lyaml -lwebsockets -L/usr/local/lib
1+
INCLUDE:=-I../../kubernetes/
2+
LIBS:=-L../../kubernetes/build -lyaml -lwebsockets -lkubernetes -L/usr/local/lib
33
CFLAGS:=-g
44
BIN:=list_pod_bin
55

examples/list_pod/main.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#include <kube_config.h>
2-
#include <apiClient.h>
3-
#include <CoreV1API.h>
1+
#include <config/kube_config.h>
2+
#include <api/CoreV1API.h>
43
#include <stdio.h>
54

65
void list_pod(apiClient_t * apiClient)

examples/multi_thread/mt.h

+2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ extern "C" {
1010
#include <malloc.h>
1111
#include <stdio.h>
1212
#include <errno.h>
13+
#ifndef _WIN32
1314
#include <unistd.h>
15+
#endif
1416
#include <pthread.h>
1517
#include <apiClient.h>
1618
#include <CoreV1API.h>

kubernetes/.openapi-generator/COMMIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Requested Commit: master
2-
Actual Commit: a6d30cac9d7c58780a19d13621a03e4c45e44cab
2+
Actual Commit: 86ead27a409bf88118148d5dc11cb74915742347

0 commit comments

Comments
 (0)