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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Event/FaserByteStreamCnvSvc/CMakeLists.txt
+ 5
− 4
View file @ 1be5a5b2
...@@ -9,7 +9,6 @@ atlas_subdir( FaserByteStreamCnvSvc ) ...@@ -9,7 +9,6 @@ atlas_subdir( FaserByteStreamCnvSvc )
atlas_depends_on_subdirs( atlas_depends_on_subdirs(
PUBLIC PUBLIC
Control/AthenaBaseComps Control/AthenaBaseComps
#Event/ByteStreamData
Event/FaserEventStorage Event/FaserEventStorage
GaudiKernel GaudiKernel
PRIVATE PRIVATE
...@@ -24,8 +23,7 @@ atlas_depends_on_subdirs( ...@@ -24,8 +23,7 @@ atlas_depends_on_subdirs(
Event/xAOD/xAODEventInfo Event/xAOD/xAODEventInfo
Event/xAOD/xAODTrigger Event/xAOD/xAODTrigger
Event/FaserByteStreamCnvSvcBase Event/FaserByteStreamCnvSvcBase
EventFormats EventFormats)
Logging)
# External dependencies: # External dependencies:
find_package( Boost COMPONENTS system ) find_package( Boost COMPONENTS system )
...@@ -33,11 +31,14 @@ find_package( CORAL COMPONENTS CoralBase ) ...@@ -33,11 +31,14 @@ find_package( CORAL COMPONENTS CoralBase )
#find_package( tdaq-common COMPONENTS eformat_old eformat_write RawFileName #find_package( tdaq-common COMPONENTS eformat_old eformat_write RawFileName
# DataReader DataWriter ) # DataReader DataWriter )
# Stupid hack to work around faser-common Logging header
include_directories( ../../faser-common/Logging/include )
# Libraries in the package: # Libraries in the package:
atlas_add_library( FaserByteStreamCnvSvcLib atlas_add_library( FaserByteStreamCnvSvcLib
FaserByteStreamCnvSvc/*.h src/*.h src/*.cxx FaserByteStreamCnvSvc/*.h src/*.h src/*.cxx
PUBLIC_HEADERS FaserByteStreamCnvSvc PUBLIC_HEADERS FaserByteStreamCnvSvc
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES AthenaBaseComps FaserEventStorageLib GaudiKernel LINK_LIBRARIES AthenaBaseComps FaserEventStorageLib GaudiKernel
StoreGateLib rt StoreGateLib rt
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment