From adb6c0a253f4795b558aecbdf6f8ccb40b296ea4 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Tue, 4 Jun 2024 21:14:32 +0200
Subject: [PATCH] Fix broken conanfile.py
- copying of binaries didn't work (protoc, grpc_cpp_plugin)
- boost requirement was not right
---
conanfile.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index f3fc760..de0ba05 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -36,6 +36,8 @@ class CaosdbConan(ConanFile):
self.tool_requires("boost/1.78.0")
self.test_requires("gtest/1.11.0")
self.requires("grpc/1.48.4")
+ self.requires("protobuf/3.21.12")
+ self.requires("boost/1.78.0")
def config_options(self):
if self.settings.os == "Windows":
@@ -52,8 +54,13 @@ class CaosdbConan(ConanFile):
cmake = CMakeDeps(self)
cmake.generate()
- copy(self, pattern="protoc*", dst="build_tools", src="bin")
- copy(self, pattern="grpc_cpp_plugin*", dst="build_tools", src="bin")
+ for dep in self.dependencies.values():
+ dst = self.build_folder + "/build_tools"
+ src = dep.cpp_info.bindirs[0]
+ print(f"Copying from src={src} to dst={dst}")
+ copied = copy(self, pattern="protoc*", dst=dst, src=src)
+ print(f"Copied {copied}")
+ copy(self, pattern="grpc_cpp_plugin*", dst=dst, src=src)
def layout(self):
cmake_layout(self, src_folder=".")
--
GitLab