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

Fix recipe

parent 6f22c314
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(cpptango CONFIG REQUIRED)
find_package(ace CONFIG REQUIRED) find_package(ace CONFIG REQUIRED)
find_package(asm CONFIG REQUIRED) find_package(asl CONFIG REQUIRED)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(crashreporting2 CONFIG) find_package(crashreporting2 CONFIG)
endif() endif()
...@@ -20,8 +21,10 @@ set(includedirs ...@@ -20,8 +21,10 @@ 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_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 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") if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2) target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2)
endif() endif()
......
...@@ -20,9 +20,9 @@ class ContinuousAORecipe(ConanFile): ...@@ -20,9 +20,9 @@ class ContinuousAORecipe(ConanFile):
exports_sources = "CMakeLists.txt", "src/*" exports_sources = "CMakeLists.txt", "src/*"
def requirements(self): def requirements(self):
self.requires("cpptango/9.2.5@soleil/stable")
self.requires("ace/[>=1.0]@soleil/stable") self.requires("ace/[>=1.0]@soleil/stable")
self.requires("asl/[>=1.0]@soleil/stable")
self.requires("asm/[>=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