From 260d4f18c7ae36dd598ed282cad47c86aa6375f5 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <fwinkl@cern> Date: Mon, 16 Nov 2020 14:25:27 +0100 Subject: [PATCH] MCTruthClassifier: cmake cleanup, enable flake8 Remove `atlas_depends_on_subdirs` and simply handling of HepMC external. --- .../MCTruthClassifier/CMakeLists.txt | 82 ++++--------------- 1 file changed, 16 insertions(+), 66 deletions(-) diff --git a/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt b/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt index dab7644f21d0..1de31badb88c 100644 --- a/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt +++ b/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt @@ -1,97 +1,47 @@ -################################################################################ -# Package: MCTruthClassifier -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( MCTruthClassifier ) # Extra dependencies based on the environment: -set( extra_deps ) set( extra_libs ) if( XAOD_STANDALONE ) - set( extra_deps - Event/xAOD/xAODCaloEvent - Event/xAOD/xAODEgamma - Event/xAOD/xAODJet - Event/xAOD/xAODMuon - Event/xAOD/xAODTracking - Control/xAODRootAccess) - set( extra_libs xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTracking ) + set( extra_libs xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODRootAccess xAODTracking ) elseif( XAOD_ANALYSIS ) - set( extra_deps - Event/xAOD/xAODCaloEvent - Event/xAOD/xAODEgamma - Event/xAOD/xAODJet - Event/xAOD/xAODMuon - Event/xAOD/xAODTracking - GaudiKernel) - set( extra_libs xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTracking) + set( extra_libs GaudiKernel xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTracking ) elseif(GENERATIONBASE) - set(extra_deps - GaudiKernel - Generators/AtlasHepMC - Generators/GeneratorObjects - PRIVATE - Control/AthenaKernel) - set( extra_libs GeneratorObjects) + set( extra_libs GaudiKernel GeneratorObjects + PRIVATE_LINK_LIBRARIES AthenaKernel ) else() - set( extra_deps - GaudiKernel - Event/xAOD/xAODCaloEvent - Event/xAOD/xAODEgamma - Event/xAOD/xAODJet - Event/xAOD/xAODMuon - Event/xAOD/xAODTracking - Reconstruction/RecoTools/ParticlesInConeTools - Reconstruction/RecoTools/RecoToolInterfaces - Generators/AtlasHepMC - Generators/GeneratorObjects - PRIVATE - Tracking/TrkEvent/TrkEventPrimitives - Tracking/TrkEvent/TrkParametersIdentificationHelpers - Control/AthenaKernel ) set( extra_libs - xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTracking - RecoToolInterfaces GeneratorObjects ParticlesInConeToolsLib - PRIVATE_LINK_LIBRARIES TrkEventPrimitives TrkParametersIdentificationHelpers ) + GaudiKernel xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTracking + RecoToolInterfaces GeneratorObjects ParticlesInConeToolsLib + PRIVATE_LINK_LIBRARIES AthenaKernel TrkEventPrimitives TrkParametersIdentificationHelpers ) endif() -# Declare the package's dependencies: -atlas_depends_on_subdirs( - PUBLIC - Control/AthToolSupport/AsgDataHandles - Control/AthToolSupport/AsgTools - Event/xAOD/xAODTruth - Generators/TruthUtils - Generators/AtlasHepMC - ${extra_deps} ) - # External dependencies: find_package( ROOT COMPONENTS Core RIO ) find_package( HepMC ) # Libraries in the package: if( HEPMC_FOUND ) - atlas_add_library( MCTruthClassifierLib - MCTruthClassifier/*.h src/*.cxx Root/*.cxx - PUBLIC_HEADERS MCTruthClassifier - LINK_LIBRARIES AtlasHepMCLib AsgTools xAODTruth TruthUtils AsgDataHandlesLib ${extra_libs} ) -else() - atlas_add_library( MCTruthClassifierLib - MCTruthClassifier/*.h src/*.cxx Root/*.cxx - PUBLIC_HEADERS MCTruthClassifier - LINK_LIBRARIES AsgTools xAODTruth TruthUtils AsgDataHandlesLib ${extra_libs} ) + list(INSERT extra_libs 0 AtlasHepMCLib ) endif() +atlas_add_library( MCTruthClassifierLib + MCTruthClassifier/*.h src/*.cxx Root/*.cxx + PUBLIC_HEADERS MCTruthClassifier + LINK_LIBRARIES AsgTools xAODTruth TruthUtils AsgDataHandlesLib ${extra_libs} ) + if( NOT XAOD_STANDALONE ) atlas_add_component( MCTruthClassifier src/components/*.cxx - LINK_LIBRARIES GaudiKernel MCTruthClassifierLib ) + LINK_LIBRARIES MCTruthClassifierLib ) endif() atlas_add_dictionary( MCTruthClassifierDict @@ -109,4 +59,4 @@ if( XAOD_STANDALONE ) endif() # Install files from the package: -atlas_install_python_modules( python/*.py ) +atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) -- GitLab