detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-23 20:07:59 +02:00
Code Issues Actions Packages Releases Activity

changed push_back to take Cluster as input argument

Browse Source
This commit is contained in:
Mazzoleni Alice Francesca
2025-04-01 15:30:10 +02:00
parent 508adf5016
commit 745d09fbe9
6 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -81,13 +81,13 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
if(AARE_FETCH_LMFIT)
#TODO! Should we fetch lmfit from the web or inlcude a tar.gz in the repo?
#set(lmfit_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/lmfit.patch)
set(lmfit_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/patches/lmfit.patch)
FetchContent_Declare(
lmfit
GIT_REPOSITORY https://jugit.fz-juelich.de/mlz/lmfit.git
GIT_TAG main
#PATCH_COMMAND ${lmfit_patch}
#UPDATE_DISCONNECTED 1
PATCH_COMMAND ${lmfit_patch}
UPDATE_DISCONNECTED 1
#EXCLUDE_FROM_ALL 1
)
#Disable what we don't need from lmfit
@ -358,7 +358,7 @@ set(SourceFiles
add_library(aare_core STATIC ${SourceFiles})
target_include_directories(aare_core PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>" PRIVATE ${lmfit_SOURCE_DIR}/lib
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
)
target_link_libraries(
@ -369,7 +369,7 @@ target_link_libraries(
${STD_FS_LIB} # from helpers.cmake
PRIVATE
aare_compiler_flags
"$<BUILD_INTERFACE:lmfit>"
$<BUILD_INTERFACE:lmfit>
)