Skip to content
Snippets Groups Projects
Commit ce17047b authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'cmake_trigger8' into 'master' 

TrigAnalysis: CMake cleanup

See merge request !34041
parents 9b7f1a3a 1964ceac
No related branches found
No related tags found
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,!34041TrigAnalysis: CMake cleanup
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 211 deletions
InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
+ 3
− 3
View file @ ce17047b
......@@ -39,13 +39,13 @@ atlas_add_library( InDetBeamSpotFinderLib
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTracking GaudiKernel
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces )
LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTracking GaudiKernel TrigAnalysisInterfaces
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces )
atlas_add_component( InDetBeamSpotFinder
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} xAODTracking GaudiKernel AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces InDetBeamSpotFinderLib )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} xAODTracking GaudiKernel AthenaBaseComps EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces InDetBeamSpotFinderLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
......
LArCalorimeter/LArCalibUtils/CMakeLists.txt
+ 1
− 1
View file @ ce17047b
......@@ -44,7 +44,7 @@ atlas_add_component( LArCalibUtils
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${TBB_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArRawUtilsLib LArRecConditions LArRecUtilsLib LArCablingLib TBEvent CaloDetDescrLib AthenaPoolUtilities xAODEventInfo LArBadChannelToolLib LArCOOLConditions LArSimEvent )
LINK_LIBRARIES ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${TBB_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArRawUtilsLib LArRecConditions LArRecUtilsLib LArCablingLib TBEvent CaloDetDescrLib AthenaPoolUtilities xAODEventInfo LArBadChannelToolLib LArCOOLConditions LArSimEvent TrigAnalysisInterfaces )
# Install files from the package:
atlas_install_headers( LArCalibUtils )
......
Trigger/TrigAnalysis/TrigAnalysisInterfaces/CMakeLists.txt
+ 1
− 9
View file @ ce17047b
# $Id: CMakeLists.txt 762065 2016-07-15 07:15:23Z krasznaa $
################################################################################
# Package: TrigAnalysisInterfaces
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigAnalysisInterfaces )
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
Control/AthToolSupport/AsgTools )
# Component(s) in the package:
atlas_add_library( TrigAnalysisInterfaces
TrigAnalysisInterfaces/*.h
......
Trigger/TrigAnalysis/TrigDecisionTool/CMakeLists.txt
+ 2
− 65
View file @ ce17047b
################################################################################
# Package: TrigDecisionTool
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDecisionTool )
# Declare the package's dependencies:
if( XAOD_STANDALONE )
atlas_depends_on_subdirs(
PUBLIC
Control/AthToolSupport/AsgTools
Event/xAOD/xAODBase
Event/xAOD/xAODTrigger
Trigger/TrigConfiguration/TrigConfHLTData
Trigger/TrigConfiguration/TrigConfInterfaces
Trigger/TrigConfiguration/TrigConfL1Data
Trigger/TrigEvent/TrigDecisionInterface
Trigger/TrigEvent/TrigRoiConversion
Trigger/TrigEvent/TrigNavStructure
PRIVATE
Trigger/TrigEvent/TrigSteeringEvent )
elseif( XAOD_ANALYSIS )
atlas_depends_on_subdirs(
PUBLIC
Control/AthToolSupport/AsgTools
Control/StoreGate
Event/EventInfo
Event/xAOD/xAODBase
Event/xAOD/xAODTrigger
GaudiKernel
Trigger/TrigConfiguration/TrigConfHLTData
Trigger/TrigConfiguration/TrigConfInterfaces
Trigger/TrigConfiguration/TrigConfL1Data
Trigger/TrigEvent/TrigDecisionInterface
Trigger/TrigEvent/TrigRoiConversion
Trigger/TrigEvent/TrigNavStructure
PRIVATE
Control/AthenaBaseComps
Control/AthenaKernel
Trigger/TrigEvent/TrigSteeringEvent )
else()
atlas_depends_on_subdirs(
PUBLIC
Control/AthToolSupport/AsgTools
Control/StoreGate
Event/EventInfo
Event/xAOD/xAODBase
Event/xAOD/xAODTrigger
GaudiKernel
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
Trigger/TrigConfiguration/TrigConfHLTData
Trigger/TrigConfiguration/TrigConfInterfaces
Trigger/TrigConfiguration/TrigConfL1Data
Trigger/TrigEvent/TrigDecisionEvent
Trigger/TrigEvent/TrigDecisionInterface
Trigger/TrigEvent/TrigMuonEvent
Trigger/TrigEvent/TrigRoiConversion
Trigger/TrigEvent/TrigNavStructure
Trigger/TrigEvent/TrigNavigation
Trigger/TrigEvent/TrigStorageDefinitions
Trigger/TrigSteer/TrigCompositeUtils
PRIVATE
Control/AthenaBaseComps
Control/AthenaKernel
Trigger/TrigEvent/TrigSteeringEvent )
endif()
# External dependencies:
find_package( Boost )
find_package( ROOT COMPONENTS Core PyROOT )
......@@ -127,6 +64,6 @@ if( NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
endif()
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( share/checkTriggerEDM.py
share/checkTriggerProcessingErrors.py )
Trigger/TrigAnalysis/TrigJiveXML/CMakeLists.txt
+ 2
− 26
View file @ ce17047b
################################################################################
# Package: TrigJiveXML
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigJiveXML )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Tracking/TrkEvent/TrkPrepRawData
Trigger/TrigAnalysis/TrigDecisionTool
graphics/JiveXML
PRIVATE
Event/EventInfo
Event/xAOD/xAODTrigL1Calo
Event/xAOD/xAODTrigger
GaudiKernel
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecEvent/InDetPrepRawData
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
Trigger/TrigEvent/TrigInDetEvent
Trigger/TrigEvent/TrigSteeringEvent
Trigger/TrigT1/TrigT1CaloEvent
Trigger/TrigT1/TrigT1Interfaces )
# External dependencies:
find_package( CLHEP )
......@@ -33,9 +11,7 @@ atlas_add_component( TrigJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkPrepRawData TrigDecisionToolLib JiveXMLLib EventInfo xAODTrigL1Calo xAODTrigger GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData AnalysisTriggerEvent TrigInDetEvent TrigSteeringEvent TrigT1CaloEventLib TrigT1Interfaces )
LINK_LIBRARIES ${CLHEP_LIBRARIES} AnalysisTriggerEvent AthenaBaseComps EventInfo InDetIdentifier InDetPrepRawData JiveXMLLib TrigDecisionToolLib TrigInDetEvent TrigSteeringEvent TrigT1CaloEventLib TrigT1Interfaces TrkPrepRawData xAODTrigL1Calo xAODTrigger )
# Install files from the package:
atlas_install_headers( TrigJiveXML )
atlas_install_joboptions( share/*.py )
Trigger/TrigAnalysis/TrigMuonMatching/CMakeLists.txt
+ 4
− 23
View file @ ce17047b
################################################################################
# Package: TrigMuonMatching
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMuonMatching )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthToolSupport/AsgTools
Event/xAOD/xAODMuon
Trigger/TrigAnalysis/TrigDecisionTool
PRIVATE
Control/AthenaBaseComps
Event/xAOD/xAODTrigMuon
Event/xAOD/xAODTrigger
GaudiKernel
Trigger/TrigConfiguration/TrigConfxAOD )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( TrigMuonMatchingLib
src/*.cxx
Root/*.cxx
PUBLIC_HEADERS TrigMuonMatching
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AsgTools xAODMuon TrigDecisionToolLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTrigMuon xAODTrigger GaudiKernel )
PRIVATE_LINK_LIBRARIES AthenaBaseComps GaudiKernel xAODRootAccess xAODTrigMuon xAODTrigger
LINK_LIBRARIES AsgTools TrigDecisionToolLib xAODMuon )
atlas_add_component( TrigMuonMatching
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODMuon TrigDecisionToolLib AthenaBaseComps xAODTrigMuon xAODTrigger GaudiKernel TrigMuonMatchingLib )
LINK_LIBRARIES TrigMuonMatchingLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
......
Trigger/TrigAnalysis/TrigObjectMatching/CMakeLists.txt
+ 6
− 33
View file @ ce17047b
################################################################################
# Package: TrigObjectMatching
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigObjectMatching )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
Control/CxxUtils
Control/AthContainers
GaudiKernel
Reconstruction/Jet/JetEvent
Reconstruction/egamma/egammaEvent
Reconstruction/tauEvent
Trigger/TrigAnalysis/TrigDecisionTool
Trigger/TrigEvent/TrigCaloEvent
Trigger/TrigEvent/TrigMuonEvent
Trigger/TrigEvent/TrigParticle
Trigger/TrigEvent/TrigSteeringEvent
PRIVATE
Event/EventKernel
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
Reconstruction/MuonIdentification/muonEvent )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( Boost COMPONENTS regex )
# Component(s) in the package:
atlas_add_library( TrigObjectMatchingLib
src/*.cxx
PUBLIC_HEADERS TrigObjectMatching
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers GaudiKernel JetEvent egammaEvent tauEvent TrigCaloEvent TrigMuonEvent TrigParticle TrigSteeringEvent TrigDecisionToolLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventKernel AnalysisTriggerEvent muonEvent )
LINK_LIBRARIES AnalysisTriggerEvent AthContainers AthenaBaseComps AthenaKernel CxxUtils EventKernel GaudiKernel JetEvent TrigCaloEvent TrigDecisionToolLib TrigMuonEvent TrigParticle TrigSteeringEvent egammaEvent muonEvent tauEvent
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
atlas_add_component( TrigObjectMatching
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers GaudiKernel JetEvent egammaEvent tauEvent TrigDecisionToolLib TrigCaloEvent TrigMuonEvent TrigParticle TrigSteeringEvent EventKernel AnalysisTriggerEvent muonEvent TrigObjectMatchingLib )
LINK_LIBRARIES TrigObjectMatchingLib )
atlas_add_dictionary( TrigObjectMatchingDict
TrigObjectMatching/TrigObjectMatchingDict.h
TrigObjectMatching/selection.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers GaudiKernel JetEvent egammaEvent tauEvent TrigDecisionToolLib TrigCaloEvent TrigMuonEvent TrigParticle TrigSteeringEvent EventKernel AnalysisTriggerEvent muonEvent TrigObjectMatchingLib )
LINK_LIBRARIES TrigObjectMatchingLib )
Trigger/TrigAnalysis/TrigRootAnalysis/CMakeLists.txt
+ 3
− 14
View file @ ce17047b
################################################################################
# Package: TrigRootAnalysis
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigRootAnalysis )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
PRIVATE
Control/AthenaBaseComps
Control/AthenaKernel
Control/StoreGate )
# External dependencies:
find_package( ROOT COMPONENTS RIO Cint Core Tree MathCore Hist pthread )
......@@ -28,6 +18,5 @@ atlas_add_library( TrigRootAnalysis
${TrigRootAnalysisDictSource}
PUBLIC_HEADERS TrigRootAnalysis
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaKernel )
LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel
PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaKernel StoreGateLib )
Trigger/TrigAnalysis/TriggerMatchingTool/CMakeLists.txt
+ 2
− 23
View file @ ce17047b
# $Id: CMakeLists.txt 780705 2016-10-27 11:45:18Z krasznaa $
################################################################################
# Package: TriggerMatchingTool
################################################################################
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TriggerMatchingTool )
# Extra dependencies, based on the build environment:
set( extra_deps )
if( NOT XAOD_STANDALONE )
set( extra_deps Control/AthAnalysisBaseComps GaudiKernel )
endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
Control/AthToolSupport/AsgTools
Event/xAOD/xAODBase
Trigger/TrigAnalysis/TrigDecisionTool
Trigger/TrigEvent/TrigNavStructure
PRIVATE
Event/FourMomUtils
Event/xAOD/xAODTrigger
${extra_deps} )
# External dependencies:
find_package( Boost )
find_package( ROOT COMPONENTS Core Hist RIO )
......@@ -40,7 +19,7 @@ if( NOT XAOD_STANDALONE )
atlas_add_component( TriggerMatchingTool
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} xAODBase GaudiKernel
LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel
AthAnalysisBaseCompsLib TriggerMatchingToolLib )
endif()
......
Trigger/TrigAnalysis/TriggerMatchingTool/test/TriggerMatchingTool.xml deleted 100644 → 0
+ 0
− 14
View file @ 9b7f1a3a
<?xml version="1.0"?>
<atn>
<TEST name="TestMatchingToolAlg" type="athena" suite="ASGTests">
<options_atn>TriggerMatchingTool/TestMatchingToolAlgJobOptions.py || { rm TestMatchingToolAlg.results.root;exit 1; }</options_atn>
<timelimit>15</timelimit>
<author> Lukas Heinrich </author>
<mailto> lukas.heinrich@cern.ch </mailto>
<expectations>
<errorMessage>FAILURE (ERROR)</errorMessage>
<returnValue>0</returnValue>
</expectations>
<postscript>rootcomp.py --html --atnMode --output rootcomp.TestMatchingToolAlg.results TestMatchingToolAlg.results.root</postscript>
</TEST>
</atn>
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