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

Merge branch 'muoncalib_cmake' into 'main' 

MuonCalibStreamCnv[Svc]+MuonMM_CnvTools: cleanup link dependencies

See merge request !74855
parents 9c5a91bf 7642294b
16 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74855MuonCalibStreamCnv[Svc]+MuonMM_CnvTools: cleanup link dependencies
Hide whitespace changes
Inline Side-by-side
MuonSpectrometer/MuonCalib/MuonCalibStream/MuonCalibStreamCnv/CMakeLists.txt
+ 7
− 25
View file @ 2976a5b3
################################################################################
# Package: MuonCalibStreamCnv
################################################################################
# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonCalibStreamCnv )
# External dependencies:
find_package( COOL COMPONENTS CoolKernel )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( tdaq-common COMPONENTS MuCalDecode )
# Component(s) in the package:
# OLD: RPCcablingInterfaceLib
atlas_add_library( MuonCalibStreamCnvLib
src/*.cxx
PUBLIC_HEADERS MuonCalibStreamCnv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES}
AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel CSCcablingLib MuonReadoutGeometry MuonIdHelpersLib
MuonRDO MuonPrepRawData SGTools CoraCool EventInfo MdtCalibSvcLib MuonCalibEvent MuonCSC_CnvToolsLib MuonCnvToolInterfacesLib
MuonCalibStreamCnvSvcLib RPC_CondCablingLib MuonCondData MuonTrigCoinData)
atlas_add_component( MuonCalibStreamCnv
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES}
AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel CSCcablingLib MuonReadoutGeometry MuonIdHelpersLib
MuonRDO MuonPrepRawData SGTools CoraCool EventInfo MdtCalibSvcLib MuonCalibEvent MuonCSC_CnvToolsLib MuonCnvToolInterfacesLib
MuonCalibStreamCnvSvcLib RPC_CondCablingLib MuonCondData MuonTrigCoinData)
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES}
AthenaBaseComps AthenaKernel GaudiKernel MdtCalibData MdtCalibInterfacesLib
MuonCablingData MuonCalibEvent MuonCalibStreamCnvSvcLib MuonIdHelpersLib
MuonPrepRawData MuonRDO MuonReadoutGeometry MuonTrigCoinData RPC_CondCablingLib
StoreGateLib xAODEventInfo )
# atlas_install_joboptions( share/*.py )
# atlas_install_runtime( share/calibtest.dat )
# Install files from the package:
atlas_install_python_modules( python/*.py )
MuonSpectrometer/MuonCalib/MuonCalibStream/MuonCalibStreamCnvSvc/CMakeLists.txt
+ 3
− 9
View file @ 2976a5b3
################################################################################
# Package: MuonCalibStreamCnvSvc
################################################################################
# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonCalibStreamCnvSvc )
......@@ -12,22 +10,18 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( tdaq-common COMPONENTS MuCalDecode )
# Component(s) in the package:
# OLD: RPCcablingInterfaceLib
atlas_add_library( MuonCalibStreamCnvSvcLib
src/*.cxx MuonCalibStreamCnvSvc/*.h
PUBLIC_HEADERS MuonCalibStreamCnvSvc
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES}
AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel CSCcablingLib MuonReadoutGeometry MuonIdHelpersLib
MuonRDO MuonPrepRawData SGTools CoraCool EventInfo MdtCalibSvcLib MuonCalibEvent MuonCSC_CnvToolsLib MuonCnvToolInterfacesLib)
AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel
PRIVATE_LINK_LIBRARIES CoraCool SGTools xAODEventInfo )
atlas_add_component( MuonCalibStreamCnvSvc
src/*.cxx
src/components/*.cxx
LINK_LIBRARIES MuonCalibStreamCnvSvcLib )
# atlas_install_joboptions( share/*.py )
# atlas_install_runtime( share/calibtest.dat )
# Install files from the package:
atlas_install_python_modules( python/*.py )
MuonSpectrometer/MuonCnv/MuonMM_CnvTools/CMakeLists.txt
+ 3
− 4
View file @ 2976a5b3
# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonMM_CnvTools )
......@@ -10,12 +10,11 @@ atlas_add_library( MuonMM_CnvToolsLib
MuonMM_CnvTools/*.h
INTERFACE
PUBLIC_HEADERS MuonMM_CnvTools
LINK_LIBRARIES GaudiKernel)
LINK_LIBRARIES ByteStreamData GaudiKernel MuonRDO xAODMuonRDO )
# Component(s) in the package:
atlas_add_component( MuonMM_CnvTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps SGTools StoreGateLib SGtests AtlasDetDescr Identifier EventPrimitives MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonNSWCommonDecode MuonRDO MuonPrepRawData MMClusterizationLib NSWCalibToolsLib MuonCnvToolInterfacesLib MuonMM_CnvToolsLib MuonCablingData xAODMuonRDO xAODMuonPrepData)
LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel AthenaBaseComps StoreGateLib Identifier MuonCondData MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonNSWCommonDecode MuonRDO MuonPrepRawData MMClusterizationLib NSWCalibToolsLib MuonCnvToolInterfacesLib MuonMM_CnvToolsLib MuonCablingData TrkEventPrimitives xAODMuonRDO xAODMuonPrepData)
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