Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

influxdb-cxx: add recipe #19148

Merged
merged 4 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions recipes/influxdb-cxx/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
102 changes: 102 additions & 0 deletions recipes/influxdb-cxx/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one looks a little unusual - is it not possible to build the shared variant without the consumers defining preprocessor definitions externally?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be necessary as the define is handled by CMakes GenerateExportHeader. However, there are reports of issues on MSVC. I wasn't able to reproduce the issue, but I'm no MSVC dev.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jcar87
You are right.
I don't understand why this definition is required.
But without this, there are compilation errors on MSVC shared build.

https://c3i.jfrog.io/c3i/misc/logs/pr/19148/1-windows-visual_studio/influxdb-cxx/0.7.1//f59f556ebd620e0f58fe3eabfec9529d6418a829-build.txt

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @toge - there is indeed a pre-existing issue, I've updated the recipe to reference it

I've had a chance to investigate the root cause and made a comment here:
offa/influxdb-cxx#194 (comment)

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")
8 changes: 8 additions & 0 deletions recipes/influxdb-cxx/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
26 changes: 26 additions & 0 deletions recipes/influxdb-cxx/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -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")
16 changes: 16 additions & 0 deletions recipes/influxdb-cxx/all/test_package/test_package.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#include <InfluxDBFactory.h>
#include <InfluxDBException.h>
#include <iostream>

int main()
{
try {
auto influxdb = influxdb::InfluxDBFactory::Get("xyz://foobar");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed this to not reference localhost - in the odd chance something is actually running. Test packages in Conan center must not make network requests to any resource whatsover.

}
catch(influxdb::InfluxDBException& e) {

}

std::cout << "Influxdb-cxx test package successful\n";
return 0;
}
3 changes: 3 additions & 0 deletions recipes/influxdb-cxx/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
versions:
"0.7.2":
folder: all
Loading