From 7cad09d82df45d1b3baccc20c46a5be2059f1651 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 10 Dec 2024 17:51:52 +0100
Subject: [PATCH] Fix conan and cmake recipes
---
CMakeLists.txt | 2 +-
conanfile.py | 33 ++-------------------------------
2 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58c8700..a4f1dc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/conanfile.py b/conanfile.py
index 09c3372..89a2f6c 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -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"]
-
--
GitLab