Skip to content
Snippets Groups Projects
Commit 58095e88 authored by POTIER Frederic's avatar POTIER Frederic
Browse files

Fix recipe

parent aa126619
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
project(${PROJECT_NAME} CXX) project(${PROJECT_NAME} CXX)
find_package(electrometers CONFIG REQUIRED) find_package(electrometerslibrary CONFIG REQUIRED)
find_package(yat4tango CONFIG REQUIRED) find_package(yat4tango CONFIG REQUIRED)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(crashreporting2 CONFIG) find_package(crashreporting2 CONFIG)
...@@ -20,7 +20,7 @@ set(includedirs ...@@ -20,7 +20,7 @@ set(includedirs
add_executable(${EXECUTABLE_NAME} ${sources}) add_executable(${EXECUTABLE_NAME} ${sources})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${includedirs}) 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) target_link_libraries(${EXECUTABLE_NAME} PRIVATE yat4tango::yat4tango)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2) target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2)
......
...@@ -20,8 +20,7 @@ class MCCE2ElectrometersRecipe(ConanFile): ...@@ -20,8 +20,7 @@ class MCCE2ElectrometersRecipe(ConanFile):
exports_sources = "CMakeLists.txt", "src/*" exports_sources = "CMakeLists.txt", "src/*"
def requirements(self): def requirements(self):
self.requires("electrometers/[>=1.0]@soleil/stable") self.requires("electrometerslibrary/[>=1.0]@soleil/stable")
self.requires("yat4tango/[>=1.0]@soleil/stable") self.requires("yat4tango/[>=1.0]@soleil/stable")
if self.settings.os == "Linux": if self.settings.os == "Linux":
self.requires("crashreporting2/[>=1.0]@soleil/stable") self.requires("crashreporting2/[>=1.0]@soleil/stable")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment