henry/KubeControl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: added the use of a local build curlpp library

Browse Source
This commit is contained in:
Henry Winkel
2023-08-09 08:43:00 +02:00
parent 726b09eb5f
commit 39f0f2b4eb
6 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -4,12 +4,12 @@
[submodule "libs/yaml-cpp"] [submodule "libs/yaml-cpp"]
path = libs/yaml-cpp path = libs/yaml-cpp
url = https://github.com/jbeder/yaml-cpp.git url = https://github.com/jbeder/yaml-cpp.git
[submodule "libs/curlcpp"]
path = libs/curlcpp
url = https://github.com/JosephP91/curlcpp.git
[submodule "libs/nlohmann_json"] [submodule "libs/nlohmann_json"]
path = libs/nlohmann_json path = libs/nlohmann_json
url = https://github.com/nlohmann/json.git url = https://github.com/nlohmann/json.git
[submodule "libs/crossguid"] [submodule "libs/crossguid"]
path = libs/crossguid path = libs/crossguid
url = https://github.com/graeme-hill/crossguid.git url = https://github.com/graeme-hill/crossguid.git
[submodule "libs/curlpp"]
path = libs/curlpp
url = https://github.com/jpbarrette/curlpp.git

11
CMakeLists.txt
View File

@@ -33,22 +33,16 @@ ENDIF()
set(YAML_CPP_INSTALL OFF CACHE INTERNAL "") set(YAML_CPP_INSTALL OFF CACHE INTERNAL "")
add_subdirectory(libs/yaml-cpp EXCLUDE_FROM_ALL) add_subdirectory(libs/yaml-cpp EXCLUDE_FROM_ALL)
ENDIF() ENDIF()
# FIND_PACKAGE(yaml-cpp REQUIRED)
IF (NOT TARGET curlpp)
IF (NOT TARGET curlcpp)
set(BUILD_SHARED_LIBS FALSE ) set(BUILD_SHARED_LIBS FALSE )
add_subdirectory(libs/curlcpp EXCLUDE_FROM_ALL) add_subdirectory(libs/curlpp EXCLUDE_FROM_ALL)
ENDIF() ENDIF()
IF(NOT TARGET crossguid) IF(NOT TARGET crossguid)
set(CROSSGUID_TESTS OFF CACHE INTERNAL "") set(CROSSGUID_TESTS OFF CACHE INTERNAL "")
add_subdirectory(libs/crossguid EXCLUDE_FROM_ALL) add_subdirectory(libs/crossguid EXCLUDE_FROM_ALL)
ENDIF() ENDIF()
# IF (NOT TARGET rest-client)
# set(BUILD_SHARED_LIBS OFF CACHE BOOL "disable testing")
# add_subdirectory(libs/rest-client EXCLUDE_FROM_ALL)
# ENDIF()
# build with CC=clang-15 CXX=clang++-15 cmake -D CMAKE_BUILD_TYPE=DEBUG .. # build with CC=clang-15 CXX=clang++-15 cmake -D CMAKE_BUILD_TYPE=DEBUG ..
@@ -73,7 +67,6 @@ ENDIF()
target_link_libraries(kubecontrol target_link_libraries(kubecontrol
crossguid crossguid
yaml-cpp yaml-cpp
curl
curlpp curlpp
loguru loguru
nlohmann_json nlohmann_json

6
include/kubecontrol/KubePod.hpp
View File

@@ -6,13 +6,17 @@
#include <vector> #include <vector>
#include <yaml-cpp/yaml.h> #include <yaml-cpp/yaml.h>
#include <fstream> #include <fstream>
#include <curlpp/cURLpp.hpp>
#include <curlpp/Easy.hpp> #include <curlpp/Easy.hpp>
#include <curlpp/Options.hpp> #include <curlpp/Options.hpp>
#include <kubecontrol/WriterMemoryClass.hpp> #include <kubecontrol/WriterMemoryClass.hpp>
#include <loguru.hpp> #include <loguru.hpp>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <curlpp/cURLpp.hpp>
#include <filesystem>
#include <map>
#include <vector>
namespace kubecontrol namespace kubecontrol
{ {

1
libs/curlcpp

Submodule libs/curlcpp deleted from b7df7787d1

1
libs/curlpp Submodule

Submodule libs/curlpp added at 1d8c7876cc

4
src/kubecontrol/KubePod.cpp
View File

@@ -1,7 +1,5 @@
#include <filesystem>
#include <kubecontrol/KubePod.hpp> #include <kubecontrol/KubePod.hpp>
#include <map>
#include <vector>
namespace kubecontrol namespace kubecontrol
{ {