Replace curl with cpr (#93)

offa · Jan 28, 2023 · 4f1f45e · 4f1f45e
1 parent bdb4859
commit 4f1f45e
Show file tree

Hide file tree

Showing 15 changed files with 440 additions and 925 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,7 +82,7 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
 find_package(Threads REQUIRED)
-find_package(CURL REQUIRED MODULE)
+find_package(cpr REQUIRED)
 
 if (INFLUXCXX_WITH_BOOST)
     # Fixes warning when using boost from brew

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ InfluxDB C++ client library
  - C++17 compiler
 
 __Dependencies__
- - CURL (required)
+ - [cpr](https://github.com/libcpr/cpr) (required)
  - boost 1.66+ (optional – see [Transports](#transports))
 
 ### Generic
@@ -124,7 +124,7 @@ List of supported transport is following:
 
 | Name        | Dependency  | URI protocol   | Sample URI                            |
 | ----------- |:-----------:|:--------------:| -------------------------------------:|
-| HTTP        | cURL<sup>i)</sup> | `http`/`https` | `http://localhost:8086?db=<db>`      |
+| HTTP        | cpr<sup>i)</sup> | `http`/`https` | `http://localhost:8086?db=<db>`  |
 | TCP         | boost       | `tcp`          | `tcp://localhost:8094`                |
 | UDP         | boost       | `udp`          | `udp://localhost:8094`                |
 | Unix socket | boost       | `unix`         | `unix:///tmp/telegraf.sock`           |

diff --git a/cmake/InfluxDBConfig.cmake.in b/cmake/InfluxDBConfig.cmake.in
@@ -9,7 +9,7 @@ include(CMakeFindDependencyMacro)
 if(InfluxDB_WITH_BOOST)
   find_dependency(Boost COMPONENTS system REQUIRED)
 endif()
-find_dependency(CURL REQUIRED)
+find_dependency(cpr REQUIRED)
 find_dependency(Threads REQUIRED)
 
 if(NOT TARGET InfluxData::InfluxDB)

diff --git a/conanfile.py b/conanfile.py
@@ -26,7 +26,6 @@ class InfluxdbCxxConan(ConanFile):
         "system": False,
         "boost": True,
         "boost:shared": True,
-        "libcurl:shared": True
     }
     exports = ["LICENSE"]
     exports_sources = ("CMakeLists.txt", "src/*", "include/*", "test/*",
@@ -54,10 +53,9 @@ def set_version(self):
             f"Project version from CMakeLists.txt: '{self.version}'")
 
     def requirements(self):
-        if not self.options.system:
-            self.requires("libcurl/7.84.0")
-            if self.options.boost:
-                self.requires("boost/1.79.0")
+        self.requires("cpr/1.9.3")
+        if not self.options.system and self.options.boost:
+            self.requires("boost/1.81.0")
         if self.options.tests:
             self.requires("catch2/3.3.0")
             self.requires("trompeloeil/43")

diff --git a/script/ci_setup.sh b/script/ci_setup.sh
@@ -3,7 +3,7 @@
 set -ex
 
 apt-get update
-apt-get install -y python3-pip libcurl4-openssl-dev
+apt-get install -y python3-pip
 pip3 install -U conan
 
 mkdir -p build && cd build

diff --git a/script/ci_testdeploy.sh b/script/ci_testdeploy.sh
@@ -12,7 +12,10 @@ cp -r script/include_library/* ${BASEPATH}/
 
 cd /tmp/influx-test-${PID}/
 mkdir build && cd build
-cmake "$@" ..
+
+conan install -g cmake_paths -g cmake_find_package cpr/1.9.3@
+
+cmake -DCMAKE_TOOLCHAIN_FILE=./conan_paths.cmake "$@" ..
 cmake --build . -j
 
 #cleanup

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,10 +4,6 @@ set(INTERNAL_INCLUDE_DIRS
     ${PROJECT_BINARY_DIR}/src
     )
 
-add_library(InfluxDB-Http OBJECT HTTP.cxx)
-target_include_directories(InfluxDB-Http PRIVATE ${INTERNAL_INCLUDE_DIRS})
-target_include_directories(InfluxDB-Http SYSTEM PUBLIC $<TARGET_PROPERTY:CURL::libcurl,INTERFACE_INCLUDE_DIRECTORIES>)
-
 
 add_library(InfluxDB-BoostSupport OBJECT
     $<$<NOT:$<BOOL:${INFLUXCXX_WITH_BOOST}>>:NoBoostSupport.cxx>
@@ -30,17 +26,27 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_
     set_source_files_properties(UDP.cxx TCP.cxx UnixSocket.cxx PROPERTIES COMPILE_OPTIONS "-Wno-null-dereference")
 endif()
 
-add_library(InfluxDB-Internal OBJECT LineProtocol.cxx)
+add_library(InfluxDB-Internal OBJECT LineProtocol.cxx HTTP.cxx)
 target_include_directories(InfluxDB-Internal PRIVATE ${INTERNAL_INCLUDE_DIRS})
+target_link_libraries(InfluxDB-Internal PUBLIC cpr::cpr)
+
+
+add_library(InfluxDB-Core OBJECT
+  InfluxDB.cxx
+  Point.cxx
+  InfluxDBFactory.cxx
+  Proxy.cxx
+  )
+target_include_directories(InfluxDB-Core PUBLIC
+    ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_BINARY_DIR}/src
+)
+target_link_libraries(InfluxDB-Core PRIVATE cpr::cpr)
 
 
 add_library(InfluxDB
-    InfluxDB.cxx
-    Point.cxx
-    InfluxDBFactory.cxx
-    Proxy.cxx
+    $<TARGET_OBJECTS:InfluxDB-Core>
     $<TARGET_OBJECTS:InfluxDB-Internal>
-    $<TARGET_OBJECTS:InfluxDB-Http>
     $<TARGET_OBJECTS:InfluxDB-BoostSupport>
     )
 add_library(InfluxData::InfluxDB ALIAS InfluxDB)
@@ -76,7 +82,7 @@ target_include_directories(InfluxDB
 # Link targets
 target_link_libraries(InfluxDB
   PRIVATE
-    CURL::libcurl
+    cpr::cpr
     Threads::Threads
     $<$<BOOL:${INFLUXCXX_WITH_BOOST}>:Boost::boost>
     $<$<BOOL:${INFLUXCXX_WITH_BOOST}>:Boost::system>