Skip to content
Snippets Groups Projects
Commit adb6c0a2 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

Fix broken conanfile.py

- copying of binaries didn't work (protoc, grpc_cpp_plugin)
- boost requirement was not right
parent 47acdfd8
Branches
Tags
2 merge requests!61Release 0.3.0,!49Resolve "EXTERN: Adapt to Conan 2"
...@@ -36,6 +36,8 @@ class CaosdbConan(ConanFile): ...@@ -36,6 +36,8 @@ class CaosdbConan(ConanFile):
self.tool_requires("boost/1.78.0") self.tool_requires("boost/1.78.0")
self.test_requires("gtest/1.11.0") self.test_requires("gtest/1.11.0")
self.requires("grpc/1.48.4") self.requires("grpc/1.48.4")
self.requires("protobuf/3.21.12")
self.requires("boost/1.78.0")
def config_options(self): def config_options(self):
if self.settings.os == "Windows": if self.settings.os == "Windows":
...@@ -52,8 +54,13 @@ class CaosdbConan(ConanFile): ...@@ -52,8 +54,13 @@ class CaosdbConan(ConanFile):
cmake = CMakeDeps(self) cmake = CMakeDeps(self)
cmake.generate() cmake.generate()
copy(self, pattern="protoc*", dst="build_tools", src="bin") for dep in self.dependencies.values():
copy(self, pattern="grpc_cpp_plugin*", dst="build_tools", src="bin") 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): def layout(self):
cmake_layout(self, src_folder=".") cmake_layout(self, src_folder=".")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment