diff --git a/.gitmodules b/.gitmodules index 60d7618..8c7e67f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,12 +4,12 @@ [submodule "libs/yaml-cpp"] path = libs/yaml-cpp 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"] path = libs/nlohmann_json url = https://github.com/nlohmann/json.git [submodule "libs/crossguid"] path = libs/crossguid url = https://github.com/graeme-hill/crossguid.git +[submodule "libs/curlpp"] + path = libs/curlpp + url = https://github.com/jpbarrette/curlpp.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f965196..70f8dbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,23 +33,17 @@ ENDIF() set(YAML_CPP_INSTALL OFF CACHE INTERNAL "") add_subdirectory(libs/yaml-cpp EXCLUDE_FROM_ALL) ENDIF() -# FIND_PACKAGE(yaml-cpp REQUIRED) - - IF (NOT TARGET curlcpp) + IF (NOT TARGET curlpp) set(BUILD_SHARED_LIBS FALSE ) - add_subdirectory(libs/curlcpp EXCLUDE_FROM_ALL) + add_subdirectory(libs/curlpp EXCLUDE_FROM_ALL) ENDIF() IF(NOT TARGET crossguid) set(CROSSGUID_TESTS OFF CACHE INTERNAL "") add_subdirectory(libs/crossguid EXCLUDE_FROM_ALL) 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 .. @@ -73,7 +67,6 @@ ENDIF() target_link_libraries(kubecontrol crossguid yaml-cpp -curl curlpp loguru nlohmann_json diff --git a/include/kubecontrol/KubePod.hpp b/include/kubecontrol/KubePod.hpp index 0f008c1..23c9e03 100644 --- a/include/kubecontrol/KubePod.hpp +++ b/include/kubecontrol/KubePod.hpp @@ -6,13 +6,17 @@ #include #include #include -#include #include #include #include #include #include +#include +#include +#include +#include + namespace kubecontrol { diff --git a/libs/curlcpp b/libs/curlcpp deleted file mode 160000 index b7df778..0000000 --- a/libs/curlcpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b7df7787d1b44b0f221d1812327db3e96f0477b7 diff --git a/libs/curlpp b/libs/curlpp new file mode 160000 index 0000000..1d8c787 --- /dev/null +++ b/libs/curlpp @@ -0,0 +1 @@ +Subproject commit 1d8c7876cc81d7d125b663066282b207d9cbfe9a diff --git a/src/kubecontrol/KubePod.cpp b/src/kubecontrol/KubePod.cpp index ad81ff2..570fa89 100644 --- a/src/kubecontrol/KubePod.cpp +++ b/src/kubecontrol/KubePod.cpp @@ -1,7 +1,5 @@ -#include #include -#include -#include + namespace kubecontrol {