From 1be5a5b22035ff46ee3b7cb84ddaab3d7819993d Mon Sep 17 00:00:00 2001
From: Eric Torrence <eric.torrence@cern.ch>
Date: Wed, 17 Jun 2020 13:51:57 -0700
Subject: [PATCH] Fix problem with faser-common Logging
---
Event/FaserByteStreamCnvSvc/CMakeLists.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Event/FaserByteStreamCnvSvc/CMakeLists.txt b/Event/FaserByteStreamCnvSvc/CMakeLists.txt
index 5b5d18d6..4198d213 100644
--- a/Event/FaserByteStreamCnvSvc/CMakeLists.txt
+++ b/Event/FaserByteStreamCnvSvc/CMakeLists.txt
@@ -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}
--
GitLab