From a0c3b1c76393105eebf6c8b8c8a358df2df3954a Mon Sep 17 00:00:00 2001
From: POTIER Frederic <frederic.potier@synchrotron-soleil.fr>
Date: Tue, 24 Oct 2023 15:39:06 +0200
Subject: [PATCH] Fix recipe
---
CMakeLists.txt | 7 +++++--
conanfile.py | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f22a8f..f3c31b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,9 @@
cmake_minimum_required(VERSION 3.15)
project(${PROJECT_NAME} CXX)
+find_package(cpptango CONFIG REQUIRED)
find_package(ace CONFIG REQUIRED)
-find_package(asm CONFIG REQUIRED)
+find_package(asl CONFIG REQUIRED)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(crashreporting2 CONFIG)
endif()
@@ -20,8 +21,10 @@ set(includedirs
add_executable(${EXECUTABLE_NAME} ${sources})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${includedirs})
+target_compile_options(${EXECUTABLE_NAME} PRIVATE /Zc:forScope-)
+target_link_libraries(${EXECUTABLE_NAME} PRIVATE cpptango::cpptango)
target_link_libraries(${EXECUTABLE_NAME} PRIVATE ace::ace)
-target_link_libraries(${EXECUTABLE_NAME} PRIVATE asm::asm)
+target_link_libraries(${EXECUTABLE_NAME} PRIVATE asl::asl)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2)
endif()
diff --git a/conanfile.py b/conanfile.py
index ab5fcd0..8324d9a 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -20,9 +20,9 @@ class ContinuousAORecipe(ConanFile):
exports_sources = "CMakeLists.txt", "src/*"
def requirements(self):
+ self.requires("cpptango/9.2.5@soleil/stable")
self.requires("ace/[>=1.0]@soleil/stable")
-
- self.requires("asm/[>=1.0]@soleil/stable")
+ self.requires("asl/[>=1.0]@soleil/stable")
if self.settings.os == "Linux":
self.requires("crashreporting2/[>=1.0]@soleil/stable")
--
GitLab