From bbbf6ce4e8792f9fb604bde0c52b377529744dfd Mon Sep 17 00:00:00 2001 From: Andrew Morrow Date: Tue, 8 Apr 2025 17:04:37 -0400 Subject: [PATCH] [RSDK-10385] Misc conan improvements --- .gitignore | 3 +++ conanfile.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8110b0703..c37f076b3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ # ignore doxygen output /etc/docs/api/* + +# Conan user presets should be ignored +CMakeUserPresets.json diff --git a/conanfile.py b/conanfile.py index a75db1215..574ad5450 100644 --- a/conanfile.py +++ b/conanfile.py @@ -49,8 +49,7 @@ def requirements(self): # maintained conan packages. self.requires('grpc/[>=1.48.4]') self.requires('protobuf/[>=3.17.1]') - - self.requires('xtensor/[>=0.24.3]') + self.requires('xtensor/[>=0.24.3]', transitive_headers=True) def build_requirements(self): if self.options.offline_proto_generation: @@ -126,7 +125,6 @@ def package_info(self): "grpc::grpc++_reflection", "protobuf::libprotobuf", "xtensor::xtensor", - "viamapi", ])