Skip to content
Snippets Groups Projects
Commit a9c8559a authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

Merge branch 'cmake.SCT_RawDataByteStreamCnv-20200727' into 'master'

SCT_RawDataByteStreamCnv+TRT_RawDataByteStreamCnv+TrkValTools: cmake fixes

See merge request !35148
parents 11d86fd8 5028082b
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!35148SCT_RawDataByteStreamCnv+TRT_RawDataByteStreamCnv+TrkValTools: cmake fixes
......@@ -29,12 +29,18 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( tdaq-common COMPONENTS eformat_write DataWriter )
atlas_add_library( SCT_RawDataByteStreamCnvLib
SCT_RawDataByteStreamCnv/*.h
INTERFACE
PUBLIC_HEADERS SCT_RawDataByteStreamCnv
LINK_LIBRARIES GaudiKernel InDetRawData ByteStreamCnvSvcBaseLib ByteStreamData InDetByteStreamErrors )
# Component(s) in the package:
atlas_add_component( SCT_RawDataByteStreamCnv
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel InDetRawData InDetByteStreamErrors AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier xAODEventInfo InDetIdentifier InDetReadoutGeometry SCT_ReadoutGeometry SCT_CablingLib TrigSteeringEvent SCT_ConditionsData SCT_ConditionsToolsLib )
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} SCT_RawDataByteStreamCnvLib ByteStreamData_test AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier xAODEventInfo InDetIdentifier InDetReadoutGeometry SCT_ReadoutGeometry SCT_CablingLib TrigSteeringEvent SCT_ConditionsData SCT_ConditionsToolsLib )
# Run tests:
atlas_add_test( TestSCTDecode
......@@ -50,5 +56,4 @@ atlas_add_test( TestSCTEncode
ENVIRONMENT THREADS=1 )
# Install files from the package:
atlas_install_headers( SCT_RawDataByteStreamCnv )
atlas_install_joboptions( share/*.py )
......@@ -34,12 +34,18 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( tdaq-common COMPONENTS eformat_write DataWriter )
atlas_add_library( TRT_RawDataByteStreamCnvLib
TRT_RawDataByteStreamCnv/*.h
INTERFACE
PUBLIC_HEADERS TRT_RawDataByteStreamCnv
LINK_LIBRARIES AthenaBaseComps ByteStreamData InDetRawData Identifier InDetIdentifier TRT_CablingLib )
# Component(s) in the package:
atlas_add_component( TRT_RawDataByteStreamCnv
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps Identifier ByteStreamData ByteStreamData_test InDetRawData AthenaKernel CxxUtils StoreGateLib SGtests AthenaPoolUtilities ByteStreamCnvSvcBaseLib GaudiKernel TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver IRegionSelector TrigSteeringEvent TRT_CablingLib InDetByteStreamErrors )
LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} TRT_RawDataByteStreamCnvLib ByteStreamData_test AthenaKernel CxxUtils
StoreGateLib SGtests AthenaPoolUtilities ByteStreamCnvSvcBaseLib GaudiKernel TRT_ConditionsServicesLib InDetReadoutGeometry TRT_ReadoutGeometry PathResolver IRegionSelector TrigSteeringEvent InDetByteStreamErrors )
# Install files from the package:
atlas_install_headers( TRT_RawDataByteStreamCnv )
......@@ -59,13 +59,17 @@ find_package( Eigen )
find_package( XercesC )
find_package( Boost )
atlas_add_library( TrkValToolsLib
TrkValTools/*.h
INTERFACE
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
PUBLIC_HEADERS TrkValTools
LINK_LIBRARIES GaudiKernel AthenaBaseComps TrkValInterfaces StoreGateLib xAODEventInfo TrkParameters TrkValEvent AtlasHepMCLib TrkEventPrimitives TrkTrack AthContainers )
# Component(s) in the package:
atlas_add_component( TrkValTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthContainers AthenaKernel xAODTracking GaudiKernel TrkEventPrimitives TrkParameters TrkTrack TrkToolInterfaces TrkValEvent TrkValInterfaces CommissionEvent AtlasDetDescr EventInfo EventPrimitives GeneratorObjects TrkSurfaces TrkCompetingRIOsOnTrack TrkEventUtils TrkMaterialOnTrack TrkMeasurementBase TrkParticleBase TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkExInterfaces TrkFitterUtils xAODTruth xAODJet xAODPFlow xAODCaloEvent xAODCore xAODEventInfo AsgTools AthenaKernel AthenaMonitoringLib)
# Install files from the package:
atlas_install_headers( TrkValTools )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} TrkValToolsLib AthenaKernel xAODTracking TrkToolInterfaces CommissionEvent AtlasDetDescr EventInfo EventPrimitives GeneratorObjects TrkSurfaces TrkCompetingRIOsOnTrack TrkEventUtils TrkMaterialOnTrack TrkMeasurementBase TrkParticleBase TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkExInterfaces TrkFitterUtils xAODTruth xAODJet xAODPFlow xAODCaloEvent xAODCore AsgTools AthenaKernel AthenaMonitoringLib)
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