Merge branch 'trigtauana' into 'master'

TrigTauEmulation+TrigTauMatching: cmake fixes

See merge request atlas/athena!34960

Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/CMakeLists.txt

-################################################################################
-# Package: TrigTauEmulation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigTauEmulation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-  PUBLIC
-  Control/AthToolSupport/AsgTools
-  Event/xAOD/xAODEventInfo
-  Event/xAOD/xAODTau
-  Event/xAOD/xAODTracking
-  Event/xAOD/xAODTrigger
-  PhysicsAnalysis/AnalysisCommon/PATCore
-  PhysicsAnalysis/AnalysisCommon/PATInterfaces
-  Trigger/TrigAnalysis/TrigDecisionTool
-  PRIVATE
-  Control/AthContainers
-  Control/AthenaBaseComps
-  Event/xAOD/xAODBase
-  Event/xAOD/xAODCore
-  Event/xAOD/xAODJet
-  GaudiKernel )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core MathCore Hist )
 
@@ -38,13 +17,12 @@ atlas_add_library( TrigTauEmulationLib
 
 atlas_add_component( TrigTauEmulation
   src/*.h src/*.cxx src/components/*.cxx
-  LINK_LIBRARIES GaudiKernel AthenaBaseComps xAODJet xAODTau xAODTrigger
-  xAODTracking TrigTauEmulationLib )
+  LINK_LIBRARIES AthenaBaseComps GaudiKernel TrigTauEmulationLib xAODJet )
 
 atlas_add_dictionary( TrigTauEmulationDict
   TrigTauEmulation/TrigTauEmulationDict.h
   TrigTauEmulation/selection.xml
-  LINK_LIBRARIES AsgTools TrigTauEmulationLib )
+  LINK_LIBRARIES TrigTauEmulationLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching/CMakeLists.txt

-# $Id: CMakeLists.txt 781031 2016-10-28 15:10:31Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # The name of the package:
 atlas_subdir( TrigTauMatching )
 
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
-   set( extra_deps Control/xAODRootAccess )
-else()
-   set( extra_deps Control/AthenaBaseComps GaudiKernel )
-endif()
-
-# The dependencies of the package:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODTau
-   Event/xAOD/xAODTrigger
-   Trigger/TrigAnalysis/TrigDecisionTool
-   PRIVATE
-   Event/xAOD/xAODCore
-   Trigger/TrigConfiguration/TrigConfxAOD
-   ${extra_deps} )
-
 # External(s) the package uses:
 find_package( ROOT COMPONENTS Core Hist Tree RIO )