mirror of
https://github.com/slsdetectorgroup/aare.git
synced 2025-06-18 18:27:13 +02:00
Compare commits
2 Commits
main
...
fix/macro_
Author | SHA1 | Date | |
---|---|---|---|
968e0f6b7e | |||
e47605168a |
@ -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()
|
||||||
@ -366,6 +355,7 @@ set(PUBLICHEADERS
|
|||||||
include/aare/GainMap.hpp
|
include/aare/GainMap.hpp
|
||||||
include/aare/geo_helpers.hpp
|
include/aare/geo_helpers.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
|
||||||
@ -424,6 +414,17 @@ target_link_libraries(
|
|||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
||||||
set_target_properties(aare_core PROPERTIES
|
set_target_properties(aare_core PROPERTIES
|
||||||
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||||
PUBLIC_HEADER "${PUBLICHEADERS}"
|
PUBLIC_HEADER "${PUBLICHEADERS}"
|
||||||
@ -467,7 +468,6 @@ 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}"
|
||||||
|
Reference in New Issue
Block a user