From 68f5a3fdf4e8fb62f2da50d3ce12bcf2ed64012e Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Fri, 20 Nov 2020 10:17:44 +0100
Subject: [PATCH] PhysicsAnalysis/Interfaces: cmake cleanup
Remove `atlas_depends_on_subdirs` and tidy link dependencies.
---
.../AsgAnalysisInterfaces/CMakeLists.txt | 10 +---------
.../FTagAnalysisInterfaces/CMakeLists.txt | 15 +++------------
.../JetAnalysisInterfaces/CMakeLists.txt | 9 ++-------
.../MuonAnalysisInterfaces/CMakeLists.txt | 2 ++
.../PMGAnalysisInterfaces/CMakeLists.txt | 8 ++------
.../TriggerAnalysisInterfaces/CMakeLists.txt | 18 +++---------------
6 files changed, 13 insertions(+), 49 deletions(-)
diff --git a/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt
index 0c0de6de450..5e6bb4d9d4e 100644
--- a/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces/CMakeLists.txt
@@ -1,16 +1,8 @@
-# $Id: CMakeLists.txt 782748 2016-11-07 13:28:06Z will $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# The name of the package:
atlas_subdir( AsgAnalysisInterfaces )
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODBase
- Event/xAOD/xAODEventInfo
- PhysicsAnalysis/AnalysisCommon/PATInterfaces )
-
# External(s):
find_package( ROOT COMPONENTS Core )
diff --git a/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt
index f66377acc46..1dc90a79f6d 100644
--- a/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/FTagAnalysisInterfaces/CMakeLists.txt
@@ -1,23 +1,14 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# The name of the package:
atlas_subdir( FTagAnalysisInterfaces )
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODJet
- PhysicsAnalysis/AnalysisCommon/PATCore
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
- PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency )
-
# Component(s) in the package:
atlas_add_library( FTagAnalysisInterfacesLib
FTagAnalysisInterfaces/*.h
INTERFACE
PUBLIC_HEADERS FTagAnalysisInterfaces
- LINK_LIBRARIES AsgTools xAODBTagging xAODJet PATCoreLib CalibrationDataInterfaceLib )
+ LINK_LIBRARIES AsgTools xAODBTaggingEfficiencyLib xAODJet PATCoreLib PATInterfaces CalibrationDataInterfaceLib )
atlas_add_dictionary( FTagAnalysisInterfacesDict
FTagAnalysisInterfaces/FTagAnalysisInterfacesDict.h
diff --git a/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt
index c79c2eeeafc..8b613510a9d 100644
--- a/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/JetAnalysisInterfaces/CMakeLists.txt
@@ -1,13 +1,8 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# The name of the package:
atlas_subdir( JetAnalysisInterfaces )
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODJet
- PhysicsAnalysis/AnalysisCommon/PATCore )
-
# Component(s) in the package:
atlas_add_library( JetAnalysisInterfacesLib
JetAnalysisInterfaces/*.h
diff --git a/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt
index 5c24a36f64c..f24b154e6c8 100644
--- a/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/CMakeLists.txt
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# The name of the package:
atlas_subdir( MuonAnalysisInterfaces )
diff --git a/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt
index 9bca6b5e8fe..2fe7f429990 100644
--- a/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/PMGAnalysisInterfaces/CMakeLists.txt
@@ -1,12 +1,8 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# The name of the package:
atlas_subdir( PMGAnalysisInterfaces )
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/AnalysisCommon/PATInterfaces )
-
# Component(s) in the package:
atlas_add_library( PMGAnalysisInterfacesLib
PMGAnalysisInterfaces/*.h
diff --git a/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt b/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt
index e54346078a7..f777f52a660 100644
--- a/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt
+++ b/PhysicsAnalysis/Interfaces/TriggerAnalysisInterfaces/CMakeLists.txt
@@ -1,26 +1,14 @@
-# copied from AsgAnalysisInterfaces
-
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# The name of the package:
atlas_subdir( TriggerAnalysisInterfaces )
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODMuon
- PhysicsAnalysis/AnalysisCommon/PATInterfaces )
-
-# External(s):
-find_package( ROOT COMPONENTS Core )
-
# Component(s) in the package:
atlas_add_library( TriggerAnalysisInterfaces
TriggerAnalysisInterfaces/*.h
INTERFACE
PUBLIC_HEADERS TriggerAnalysisInterfaces
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon PATInterfaces )
+ LINK_LIBRARIES AsgTools xAODEgamma xAODMuon PATInterfaces )
atlas_add_dictionary( TriggerAnalysisInterfacesDict
TriggerAnalysisInterfaces/TriggerAnalysisInterfacesDict.h
--
GitLab