From d350f314ca6ee649534b914f6d552969d8310073 Mon Sep 17 00:00:00 2001 From: toge Date: Fri, 9 Feb 2024 20:24:03 +0900 Subject: [PATCH] (#19148) influxdb-cxx: add recipe * influxdb-cxx: add recipe * remove unused import * fix compilation error on msvc shared build * Use 0.7.2, fix test_package, reference github issue --------- Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> --- recipes/influxdb-cxx/all/conandata.yml | 4 + recipes/influxdb-cxx/all/conanfile.py | 102 ++++++++++++++++++ .../all/test_package/CMakeLists.txt | 8 ++ .../all/test_package/conanfile.py | 26 +++++ .../all/test_package/test_package.cpp | 16 +++ recipes/influxdb-cxx/config.yml | 3 + 6 files changed, 159 insertions(+) create mode 100644 recipes/influxdb-cxx/all/conandata.yml create mode 100644 recipes/influxdb-cxx/all/conanfile.py create mode 100644 recipes/influxdb-cxx/all/test_package/CMakeLists.txt create mode 100644 recipes/influxdb-cxx/all/test_package/conanfile.py create mode 100644 recipes/influxdb-cxx/all/test_package/test_package.cpp create mode 100644 recipes/influxdb-cxx/config.yml diff --git a/recipes/influxdb-cxx/all/conandata.yml b/recipes/influxdb-cxx/all/conandata.yml new file mode 100644 index 0000000000000..465f6aea89730 --- /dev/null +++ b/recipes/influxdb-cxx/all/conandata.yml @@ -0,0 +1,4 @@ +sources: + "0.7.2": + url: "https://github.com/offa/influxdb-cxx/archive/refs/tags/v0.7.2.tar.gz" + sha256: "951e067df5731cb23b72f53fcbea8e56920819c6191b6885ea180168eb1950d9" diff --git a/recipes/influxdb-cxx/all/conanfile.py b/recipes/influxdb-cxx/all/conanfile.py new file mode 100644 index 0000000000000..c903fb4c5efc1 --- /dev/null +++ b/recipes/influxdb-cxx/all/conanfile.py @@ -0,0 +1,102 @@ +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.files import get, copy, rmdir +from conan.tools.build import check_min_cppstd +from conan.tools.scm import Version +from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout +import os + +required_conan_version = ">=1.53.0" + +class InfluxdbCxxConan(ConanFile): + name = "influxdb-cxx" + description = "InfluxDB C++ client library." + license = "MIT" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/offa/influxdb-cxx" + topics = ("influxdb", "influxdb-client") + settings = "os", "arch", "compiler", "build_type" + package_type = "library" + options = { + "shared": [True, False], + "fPIC": [True, False], + "boost": [True, False] + } + default_options = { + "shared": False, + "fPIC": True, + "boost": True, + } + + @property + def _min_cppstd(self): + return 17 + + @property + def _compilers_minimum_version(self): + return { + "gcc": "8", + "clang": "7", + "apple-clang": "12", + "Visual Studio": "16", + "msvc": "192", + } + + def config_options(self): + if self.settings.os == "Windows": + del self.options.fPIC + + def configure(self): + if self.options.shared: + self.options.rm_safe("fPIC") + + def layout(self): + cmake_layout(self, src_folder="src") + + def requirements(self): + self.requires("cpr/1.10.4") + if self.options.boost: + self.requires("boost/1.82.0") + + def validate(self): + if self.settings.compiler.cppstd: + check_min_cppstd(self, self._min_cppstd) + minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) + if minimum_version and Version(self.settings.compiler.version) < minimum_version: + raise ConanInvalidConfiguration( + f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support." + ) + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + tc = CMakeToolchain(self) + # BUILD_SHARED_LIBS is defined explicitly in CMakeLists.txt + tc.cache_variables["BUILD_SHARED_LIBS"] = self.options.shared + tc.cache_variables["INFLUXCXX_TESTING"] = False + tc.cache_variables["INFLUXCXX_WITH_BOOST"] = self.options.boost + if self.options.shared: + # See https://github.com/offa/influxdb-cxx/issues/194 + tc.preprocessor_definitions["InfluxDB_EXPORTS"] = 1 + tc.generate() + deps = CMakeDeps(self) + deps.generate() + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def package(self): + copy(self, pattern="LICENSE", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) + cmake = CMake(self) + cmake.install() + + rmdir(self, os.path.join(self.package_folder, "lib", "cmake")) + + def package_info(self): + self.cpp_info.libs = ["InfluxDB"] + + self.cpp_info.set_property("cmake_file_name", "InfluxDB") + self.cpp_info.set_property("cmake_target_name", "InfluxData::InfluxDB") diff --git a/recipes/influxdb-cxx/all/test_package/CMakeLists.txt b/recipes/influxdb-cxx/all/test_package/CMakeLists.txt new file mode 100644 index 0000000000000..2f8068d41fdb4 --- /dev/null +++ b/recipes/influxdb-cxx/all/test_package/CMakeLists.txt @@ -0,0 +1,8 @@ +cmake_minimum_required(VERSION 3.15) +project(test_package LANGUAGES CXX) + +find_package(InfluxDB REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(test_package PRIVATE InfluxData::InfluxDB) +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) diff --git a/recipes/influxdb-cxx/all/test_package/conanfile.py b/recipes/influxdb-cxx/all/test_package/conanfile.py new file mode 100644 index 0000000000000..ef5d7042163ec --- /dev/null +++ b/recipes/influxdb-cxx/all/test_package/conanfile.py @@ -0,0 +1,26 @@ +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import cmake_layout, CMake +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv" + test_type = "explicit" + + def requirements(self): + self.requires(self.tested_reference_str) + + def layout(self): + cmake_layout(self) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindir, "test_package") + self.run(bin_path, env="conanrun") diff --git a/recipes/influxdb-cxx/all/test_package/test_package.cpp b/recipes/influxdb-cxx/all/test_package/test_package.cpp new file mode 100644 index 0000000000000..e91f55ee908cc --- /dev/null +++ b/recipes/influxdb-cxx/all/test_package/test_package.cpp @@ -0,0 +1,16 @@ +#include +#include +#include + +int main() +{ + try { + auto influxdb = influxdb::InfluxDBFactory::Get("xyz://foobar"); + } + catch(influxdb::InfluxDBException& e) { + + } + + std::cout << "Influxdb-cxx test package successful\n"; + return 0; +} diff --git a/recipes/influxdb-cxx/config.yml b/recipes/influxdb-cxx/config.yml new file mode 100644 index 0000000000000..eb766ff2f024b --- /dev/null +++ b/recipes/influxdb-cxx/config.yml @@ -0,0 +1,3 @@ +versions: + "0.7.2": + folder: all