Skip to content
Snippets Groups Projects
Commit 7cad09d8 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Fix conan and cmake recipes

parent bff1f45e
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,7 @@ set(includedirs
add_library(electrometers ${sources})
target_include_directories(electrometers PRIVATE ${includedirs})
target_link_libraries(${EXECUTABLE_NAME} PRIVATE yat::yat)
target_link_libraries(electrometers PRIVATE yat::yat)
target_link_libraries(electrometers PRIVATE cpptango::cpptango)
if (MAJOR_VERSION)
......
......@@ -5,9 +5,8 @@ class electrometersRecipe(ConanFile):
version = "2.8.1"
package_type = "library"
user = "soleil"
# python_requires = "base/[>=1.0]@soleil/stable"
# python_requires_extend = "base.Library"
python_requires = "base/[>=1.0]@soleil/stable"
python_requires_extend = "base.Library"
license = "GPL-2"
author = "Xavier Elattaoui"
......@@ -34,31 +33,3 @@ class electrometersRecipe(ConanFile):
def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")
# def layout(self):
# cmake_layout(self)
# def generate(self):
# deps = CMakeDeps(self)
# deps.generate()
# tc = CMakeToolchain(self)
# major, minor, patch = map(int, self.version.split('.'))
# tc.variables["PROJECT_NAME"] = self.name
# tc.variables["PROJECT_VERSION"] = self.version
# tc.variables["MAJOR_VERSION"] = major
# tc.variables["MINOR_VERSION"] = minor
# tc.variables["PATCH_VERSION"] = patch
# tc.generate()
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def package(self):
cmake = CMake(self)
cmake.install()
def package_info(self):
self.cpp_info.libs = ["electrometers"]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment