From f96f8b6a5eb18cb12a8bea4fd2aa20d0c2432244 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Wed, 21 May 2025 09:55:01 -0400 Subject: [PATCH 1/3] handle newer packages with c++17 --- conanfile.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 45eaad6b8..a35a82125 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,9 +47,15 @@ def requirements(self): # The SDK supports older grpc and protobuf, but these are the oldest # maintained conan packages. - self.requires('grpc/[>=1.48.4]') self.requires('protobuf/[>=3.17.1]') - self.requires('xtensor/[>=0.24.3]', transitive_headers=True) + + if self.settings.compiler.cppstd in ["14", "gnu14"]: + self.requires('grpc/[>=1.48.4 <1.70.0]') + self.requires('xtensor/[>=0.24.3 <0.26.0]', transitive_headers=True) + else: + self.requires('grpc/[>=1.48.4]') + self.requires('xtensor/[>=0.24.3]', transitive_headers=True) + def build_requirements(self): if self.options.offline_proto_generation: From bf4a7a8442d16b390dee6784412ac719c52e949a Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Wed, 21 May 2025 10:10:25 -0400 Subject: [PATCH 2/3] pin protobuf --- conanfile.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index a35a82125..06ba6e888 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,7 +47,7 @@ def requirements(self): # The SDK supports older grpc and protobuf, but these are the oldest # maintained conan packages. - self.requires('protobuf/[>=3.17.1]') + self.requires('protobuf/[>=3.17.1 <=5.27.0]') if self.settings.compiler.cppstd in ["14", "gnu14"]: self.requires('grpc/[>=1.48.4 <1.70.0]') @@ -59,8 +59,12 @@ def requirements(self): def build_requirements(self): if self.options.offline_proto_generation: - self.tool_requires('grpc/[>=1.48.4]') - self.tool_requires('protobuf/[>=3.17.1]') + if self.settings.compiler.cppstd in ["14", "gnu14"]: + self.tool_requires('grpc/[>=1.48.4 <1.70.0]') + else: + self.tool_requires('grpc/[>=1.48.4]') + + self.tool_requires('protobuf/[>=3.17.1 <= 5.27.0]') def layout(self): cmake_layout(self) From c8e52837c6e48f255952f4cc722100c3e8a7b6db Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Wed, 21 May 2025 10:31:11 -0400 Subject: [PATCH 3/3] pin proto --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 06ba6e888..864ce9ba0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,7 +47,7 @@ def requirements(self): # The SDK supports older grpc and protobuf, but these are the oldest # maintained conan packages. - self.requires('protobuf/[>=3.17.1 <=5.27.0]') + self.requires('protobuf/5.27.0') if self.settings.compiler.cppstd in ["14", "gnu14"]: self.requires('grpc/[>=1.48.4 <1.70.0]') @@ -64,7 +64,7 @@ def build_requirements(self): else: self.tool_requires('grpc/[>=1.48.4]') - self.tool_requires('protobuf/[>=3.17.1 <= 5.27.0]') + self.tool_requires('protobuf/5.27.0') def layout(self): cmake_layout(self)