From c10b5e1353a4741681c0dad4d56303a091184674 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sat, 28 Oct 2023 15:09:44 +0200 Subject: [PATCH] opentelemetry-cpp: add 1.12.0 --- recipes/opentelemetry-cpp/all/conandata.yml | 3 +++ recipes/opentelemetry-cpp/all/conanfile.py | 6 +++++- recipes/opentelemetry-cpp/config.yml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/recipes/opentelemetry-cpp/all/conandata.yml b/recipes/opentelemetry-cpp/all/conandata.yml index 02c2ccbb603ca..6030193d3bf58 100644 --- a/recipes/opentelemetry-cpp/all/conandata.yml +++ b/recipes/opentelemetry-cpp/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.12.0": + url: "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.12.0.tar.gz" + sha256: "09c208a21fb1159d114a3ea15dc1bcc5dee28eb39907ba72a6012d2c7b7564a0" "1.11.0": url: "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.11.0.tar.gz" sha256: "f30cd88bf898a5726d245eba882b8e81012021eb00df34109f4dfb203f005cea" diff --git a/recipes/opentelemetry-cpp/all/conanfile.py b/recipes/opentelemetry-cpp/all/conanfile.py index 3558a796c7faa..2b79c28b5ebdf 100644 --- a/recipes/opentelemetry-cpp/all/conanfile.py +++ b/recipes/opentelemetry-cpp/all/conanfile.py @@ -68,6 +68,10 @@ class OpenTelemetryCppConan(ConanFile): @property def _minimum_cpp_standard(self): + if self.options.with_abseil: + return 14 + if Version(self.version) >= "1.12.0": + return 14 return 11 def export_sources(self): @@ -196,7 +200,7 @@ def generate(self): tc.variables["WITH_EXAMPLES"] = False tc.variables["WITH_NO_DEPRECATED_CODE"] = self.options.with_no_deprecated_code - tc.variables["WITH_STL"] = self.options.with_stl + tc.variables["WITH_STL"] = "ON" if self.options.with_stl else "OFF" tc.variables["WITH_GSL"] = self.options.with_gsl tc.variables["WITH_ABSEIL"] = self.options.with_abseil tc.variables["WITH_OTLP_GRPC"] = self.options.get_safe("with_otlp_grpc") or False diff --git a/recipes/opentelemetry-cpp/config.yml b/recipes/opentelemetry-cpp/config.yml index 786a852cd0ae1..cb0f886cfb25a 100644 --- a/recipes/opentelemetry-cpp/config.yml +++ b/recipes/opentelemetry-cpp/config.yml @@ -1,4 +1,6 @@ versions: + "1.12.0": + folder: all "1.11.0": folder: all "1.10.0":