From 0148c9f4f3dd0b4230539083eb7fbb8cba9d0e4e Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 14 Oct 2020 14:36:02 +0200
Subject: [PATCH] Commission: cmake configuration cleanup
---
.../CommissionAthenaPool/CMakeLists.txt | 12 +-----------
Commission/CommissionEvent/CMakeLists.txt | 16 +++-------------
Commission/CommissionRec/CMakeLists.txt | 17 +----------------
Commission/CommissionUtils/CMakeLists.txt | 19 +++----------------
4 files changed, 8 insertions(+), 56 deletions(-)
diff --git a/Commission/CommissionAthenaPool/CMakeLists.txt b/Commission/CommissionAthenaPool/CMakeLists.txt
index 56f02287eeb..bedaa29d936 100644
--- a/Commission/CommissionAthenaPool/CMakeLists.txt
+++ b/Commission/CommissionAthenaPool/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: CommissionAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CommissionAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- PRIVATE
- Commission/CommissionEvent
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_poolcnv_library( CommissionAthenaPoolPoolCnv
src/*.cxx
diff --git a/Commission/CommissionEvent/CMakeLists.txt b/Commission/CommissionEvent/CMakeLists.txt
index 37829271781..d5c9b05d08f 100644
--- a/Commission/CommissionEvent/CMakeLists.txt
+++ b/Commission/CommissionEvent/CMakeLists.txt
@@ -1,17 +1,10 @@
-################################################################################
-# Package: CommissionEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CommissionEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( CommissionEvent
@@ -20,12 +13,9 @@ atlas_add_library( CommissionEvent
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel )
atlas_add_dictionary( CommissionEventDict
CommissionEvent/CommissionEventDict.h
CommissionEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CommissionEvent )
-
+ LINK_LIBRARIES CommissionEvent )
diff --git a/Commission/CommissionRec/CMakeLists.txt b/Commission/CommissionRec/CMakeLists.txt
index b498027aa21..9951e5565c2 100644
--- a/Commission/CommissionRec/CMakeLists.txt
+++ b/Commission/CommissionRec/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: CommissionRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CommissionRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Commission/CommissionUtils
- Control/AthenaBaseComps
- GaudiKernel
- PRIVATE
- Commission/CommissionEvent
- Simulation/G4Sim/TrackRecord )
-
# External dependencies:
find_package( CLHEP )
@@ -23,7 +12,3 @@ atlas_add_component( CommissionRec
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} CommissionUtilsLib AthenaBaseComps GaudiKernel CommissionEvent TrackRecordLib )
-
-# Install files from the package:
-atlas_install_headers( CommissionRec )
-
diff --git a/Commission/CommissionUtils/CMakeLists.txt b/Commission/CommissionUtils/CMakeLists.txt
index 44da15c485f..6b28d2eeaa7 100644
--- a/Commission/CommissionUtils/CMakeLists.txt
+++ b/Commission/CommissionUtils/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: CommissionUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CommissionUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- PRIVATE
- Commission/CommissionEvent
- LArCalorimeter/LArSimEvent
- Simulation/G4Sim/TrackRecord )
-
# External dependencies:
find_package( CLHEP )
@@ -25,12 +13,11 @@ atlas_add_library( CommissionUtilsLib
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel
- PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CommissionEvent LArSimEvent )
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} CommissionEvent LArSimEvent TrackRecordLib )
atlas_add_component( CommissionUtils
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel CommissionEvent LArSimEvent CommissionUtilsLib )
+ LINK_LIBRARIES CommissionUtilsLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
--
GitLab