detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-29 22:50:47 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'main' into dev/fix/rawfilereader_with_roi

Browse Source
This commit is contained in:
mazzol_a
2025-06-24 13:43:26 +02:00
committed by GitHub
parent df4dbb8fd0 c9fe16b4c2
commit d35b7762b4
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -77,17 +77,6 @@ if(AARE_SYSTEM_LIBRARIES)
# on conda-forge # on conda-forge
endif() endif()
if(AARE_VERBOSE)
add_compile_definitions(AARE_VERBOSE)
add_compile_definitions(AARE_LOG_LEVEL=aare::logDEBUG5)
else()
add_compile_definitions(AARE_LOG_LEVEL=aare::logERROR)
endif()
if(AARE_CUSTOM_ASSERT)
add_compile_definitions(AARE_CUSTOM_ASSERT)
endif()
if(AARE_BENCHMARKS) if(AARE_BENCHMARKS)
add_subdirectory(benchmarks) add_subdirectory(benchmarks)
endif() endif()
@ -363,6 +352,7 @@ set(PUBLICHEADERS
include/aare/GainMap.hpp include/aare/GainMap.hpp
include/aare/DetectorGeometry.hpp include/aare/DetectorGeometry.hpp
include/aare/JungfrauDataFile.hpp include/aare/JungfrauDataFile.hpp
include/aare/logger.hpp
include/aare/NDArray.hpp include/aare/NDArray.hpp
include/aare/NDView.hpp include/aare/NDView.hpp
include/aare/NumpyFile.hpp include/aare/NumpyFile.hpp
@ -423,6 +413,15 @@ target_link_libraries(
if(AARE_TESTS) if(AARE_TESTS)
target_compile_definitions(aare_core PRIVATE AARE_TESTS) target_compile_definitions(aare_core PRIVATE AARE_TESTS)
if(AARE_VERBOSE)
target_compile_definitions(aare_core PUBLIC AARE_VERBOSE)
target_compile_definitions(aare_core PUBLIC AARE_LOG_LEVEL=aare::logDEBUG5)
else()
target_compile_definitions(aare_core PUBLIC AARE_LOG_LEVEL=aare::logERROR)
endif()
if(AARE_CUSTOM_ASSERT)
target_compile_definitions(aare_core PUBLIC AARE_CUSTOM_ASSERT)
endif() endif()
set_target_properties(aare_core PROPERTIES set_target_properties(aare_core PROPERTIES
@ -463,12 +462,6 @@ if(AARE_TESTS)
target_sources(tests PRIVATE ${TestSources} ) target_sources(tests PRIVATE ${TestSources} )
endif() endif()
###------------------------------------------------------------------------------------------
###------------------------------------------------------------------------------------------
if(AARE_MASTER_PROJECT) if(AARE_MASTER_PROJECT)
install(TARGETS aare_core aare_compiler_flags install(TARGETS aare_core aare_compiler_flags
EXPORT "${TARGETS_EXPORT_NAME}" EXPORT "${TARGETS_EXPORT_NAME}"