From 58095e885c1c34bf9e3f17f5b617cc84a2e0b7b6 Mon Sep 17 00:00:00 2001 From: POTIER Frederic <frederic.potier@synchrotron-soleil.fr> Date: Thu, 12 Oct 2023 10:07:57 +0200 Subject: [PATCH] Fix recipe --- CMakeLists.txt | 4 ++-- conanfile.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90f265b..4b96e4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.15) project(${PROJECT_NAME} CXX) -find_package(electrometers CONFIG REQUIRED) +find_package(electrometerslibrary CONFIG REQUIRED) find_package(yat4tango CONFIG REQUIRED) if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") find_package(crashreporting2 CONFIG) @@ -20,7 +20,7 @@ set(includedirs add_executable(${EXECUTABLE_NAME} ${sources}) target_include_directories(${EXECUTABLE_NAME} PRIVATE ${includedirs}) -target_link_libraries(${EXECUTABLE_NAME} PRIVATE electrometers::electrometers) +target_link_libraries(${EXECUTABLE_NAME} PRIVATE electrometerslibrary::electrometerslibrary) target_link_libraries(${EXECUTABLE_NAME} PRIVATE yat4tango::yat4tango) if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2) diff --git a/conanfile.py b/conanfile.py index 6fab779..7940d76 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,8 +20,7 @@ class MCCE2ElectrometersRecipe(ConanFile): exports_sources = "CMakeLists.txt", "src/*" def requirements(self): - self.requires("electrometers/[>=1.0]@soleil/stable") - + self.requires("electrometerslibrary/[>=1.0]@soleil/stable") self.requires("yat4tango/[>=1.0]@soleil/stable") if self.settings.os == "Linux": self.requires("crashreporting2/[>=1.0]@soleil/stable") -- GitLab