From bc5a94aa3d85f4ea528f192875c6989bf4120adf Mon Sep 17 00:00:00 2001 From: Edgar Date: Sat, 15 Oct 2022 13:15:12 +0200 Subject: [PATCH] :wrench: Added support for building ois with conan v2 --- ois/all/conanfile.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/ois/all/conanfile.py b/ois/all/conanfile.py index 2f525cf..e7d2872 100644 --- a/ois/all/conanfile.py +++ b/ois/all/conanfile.py @@ -1,5 +1,7 @@ -from conans import ConanFile, CMake, tools -from conans.tools import os_info, SystemPackageTool +from conan import ConanFile +from conan.tools.files import get, collect_libs +from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout +from conan.tools.system import package_manager class OisConan(ConanFile): @@ -11,18 +13,22 @@ class OisConan(ConanFile): topics = ("Input", "System") settings = "os", "compiler", "build_type", "arch" + def layout(self): + cmake_layout(self) + def system_requirements(self): - if os_info.is_linux: - if os_info.with_apt: - installer = SystemPackageTool() - installer.install("libx11-dev") + package_manager.Apt(self).install(["libx11-dev"]) def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True) + get(self, **self.conan_data["sources"][self.version], strip_root=True) + + def generate(self): + tc = CMakeToolchain(self) + tc.variables["OIS_BUILD_DEMOS"] = "OFF" + tc.generate() def build(self): cmake = CMake(self) - cmake.definitions['OIS_BUILD_DEMOS'] = 'OFF' cmake.configure() cmake.build() @@ -32,4 +38,4 @@ class OisConan(ConanFile): def package_info(self): self.cpp_info.includedirs = ['include', 'include/ois'] - self.cpp_info.libs = tools.collect_libs(self) + self.cpp_info.libs = collect_libs(self)