Skip to content
Snippets Groups Projects
Commit 1be5a5b2 authored by Eric Torrence's avatar Eric Torrence
Browse files

Fix problem with faser-common Logging

parent 1289d627
No related branches found
No related tags found
25 merge requests!197Reco Script update for Segment Finder,!194Reco script update,!176Waveform Reco updates,!175Waveform reco update,!173Update production to latest master,!167Catch raw data format errors,!166Waveform raw integral bug,!165Reco scripts,!162Production Reco Scripts,!161Add waveform identifiers, configure digitizer channels,!159Move Waveform code to its own major area,!157Catch error on truncated events,!155Cluster Limit,!138Made NoisyStripFinder package,!134Added raw data reconstruction tests to pipeline,!123Waveform reconstruction bugfix,!118Wavereco bugfix,!114Rename xAOD TLB Aux Data class,!107Xrootd support,!105Wavereco bugfix,!104Wavereco,!103Waveform reconstruction,!87Scintillator Waveform POOL,!80Athena 22.0.18 compatibility and Cosmics-related development,!75Updates for bytestream reading, add faser-common as a submodule
......@@ -9,7 +9,6 @@ atlas_subdir( FaserByteStreamCnvSvc )
atlas_depends_on_subdirs(
PUBLIC
Control/AthenaBaseComps
#Event/ByteStreamData
Event/FaserEventStorage
GaudiKernel
PRIVATE
......@@ -24,8 +23,7 @@ atlas_depends_on_subdirs(
Event/xAOD/xAODEventInfo
Event/xAOD/xAODTrigger
Event/FaserByteStreamCnvSvcBase
EventFormats
Logging)
EventFormats)
# External dependencies:
find_package( Boost COMPONENTS system )
......@@ -33,11 +31,14 @@ find_package( CORAL COMPONENTS CoralBase )
#find_package( tdaq-common COMPONENTS eformat_old eformat_write RawFileName
# DataReader DataWriter )
# Stupid hack to work around faser-common Logging header
include_directories( ../../faser-common/Logging/include )
# Libraries in the package:
atlas_add_library( FaserByteStreamCnvSvcLib
FaserByteStreamCnvSvc/*.h src/*.h src/*.cxx
PUBLIC_HEADERS FaserByteStreamCnvSvc
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps FaserEventStorageLib GaudiKernel
StoreGateLib rt
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment