Merge branch 'cmake_hirec' into 'master'

HeavyIonRec: cmake cleanup

See merge request atlas/athena!37786

Reconstruction/HeavyIonRec/HIGlobal/CMakeLists.txt

-################################################################################
-# Package: HIGlobal
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( HIGlobal )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloEvent
-                          Control/AthToolSupport/AsgTools
-                          Control/AthenaBaseComps
-                          Event/NavFourMom
-                          Event/xAOD/xAODHIEvent
-                          PhysicsAnalysis/HeavyIonPhys/HIEventUtils
-                          PRIVATE
-                          Control/Navigation
-                          GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( HIGlobalLib
                    HIGlobal/*.h
                    INTERFACE
                    PUBLIC_HEADERS HIGlobal
-                   LINK_LIBRARIES AsgTools AthenaBaseComps CaloEvent GaudiKernel HIEventUtilsLib NavFourMom xAODHIEvent )
+                   LINK_LIBRARIES AsgTools AthenaBaseComps CaloEvent GaudiKernel HIEventUtilsLib NavFourMom StoreGateLib xAODCaloEvent xAODHIEvent )
 
 atlas_add_component( HIGlobal
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES GaudiKernel Navigation HIGlobalLib )
+                     LINK_LIBRARIES CaloEvent GaudiKernel HIEventUtilsLib HIGlobalLib Navigation StoreGateLib xAODHIEvent )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 

Reconstruction/HeavyIonRec/HIJetRec/CMakeLists.txt

@@ -16,7 +16,7 @@ atlas_add_library( HIJetRecLib
 
 atlas_add_component( HIJetRec
                      Root/*.cxx src/*.h src/*.cxx src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps CaloEvent CaloInterfaceLib CaloRecLib CaloUtilsLib CxxUtils HIJetRecLib JetInterface JetRecLib NavFourMom Navigation PathResolver StoreGateLib xAODCore xAODEventInfo xAODTracking )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthenaBaseComps CaloEvent CaloInterfaceLib CaloRecLib CaloUtilsLib CxxUtils FourMomUtils HIEventUtilsLib HIJetRecLib JetInterface JetRecLib NavFourMom Navigation PathResolver StoreGateLib xAODBase xAODCaloEvent xAODCore xAODEventInfo xAODHIEvent xAODJet xAODTracking )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

Reconstruction/HeavyIonRec/HIMonitoring/CMakeLists.txt

-################################################################################
-# Package: HIMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( HIMonitoring )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaMonitoring
-                          Event/xAOD/xAODEgamma
-                          Event/xAOD/xAODForward
-                          Event/xAOD/xAODHIEvent
-                          Event/xAOD/xAODMuon
-                          Event/xAOD/xAODTracking
-                          Event/xAOD/xAODTrigMinBias
-                          ForwardDetectors/ZDC/ZdcAnalysis
-			  GaudiKernel
-                          PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-                          PRIVATE
-                          Tools/LWHists )
-
 # External dependencies:
-find_package( ROOT COMPONENTS MathCore Core Tree Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+find_package( ROOT COMPONENTS Core )
 
 # Component(s) in the package:
 atlas_add_library( HIMonitoringLib
                    src/*.cxx
                    PUBLIC_HEADERS HIMonitoring
                    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-		   LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEgamma xAODForward xAODHIEvent xAODMuon xAODTracking xAODTrigMinBias GaudiKernel AthenaMonitoringLib ZdcAnalysisLib ElectronPhotonSelectorToolsLib
-                   PRIVATE_LINK_LIBRARIES LWHists )
+                   LINK_LIBRARIES AthenaMonitoringLib xAODHIEvent xAODTrigMinBias
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ElectronPhotonSelectorToolsLib LWHists PATCoreAcceptLib xAODEgamma xAODForward xAODMuon )
 
 atlas_add_component( HIMonitoring
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-		     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib xAODEgamma xAODForward xAODHIEvent xAODMuon xAODTracking xAODTrigMinBias GaudiKernel ElectronPhotonSelectorToolsLib LWHists ZdcAnalysisLib HIMonitoringLib )
+		             LINK_LIBRARIES HIMonitoringLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

Reconstruction/HeavyIonRec/HIRecExample/CMakeLists.txt

-################################################################################
-# Package: HIRecExample
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( HIRecExample )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )