Merge branch 'cmake_l1calofex' into 'master'

L1CaloFEX[ToolInterfaces]: cmake and package cleanups

See merge request atlas/athena!37266

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/CMakeLists.txt

-################################################################################
-# Package: L1CaloFEXSim
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1CaloFEXSim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps 
-			  Trigger/TrigT1/L1CaloFEXToolInterfaces
-                          Event/xAOD/xAODTruth
-                          Event/xAOD/xAODJet  )
+# External dependencies:
+find_package( Boost )
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Hist Tree gPad )
 
+# Component(s) in the package:
 atlas_add_library( L1CaloFEXSimLib
                    L1CaloFEXSim/*.h src/*.cxx
                    PUBLIC_HEADERS L1CaloFEXSim
-                   LINK_LIBRARIES AthenaBaseComps CaloEvent xAODTrigL1Calo CaloIdentifier xAODTruth xAODJet)
+                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel CaloEvent CaloIdentifier CxxUtils GaudiKernel Identifier L1CaloFEXToolInterfaces StoreGateLib xAODBase xAODCore xAODTrigL1Calo xAODTruth
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} SGTools xAODJet )
 
 atlas_add_component( L1CaloFEXSim
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps L1CaloFEXSimLib L1CaloFEXToolInterfaces xAODTruth xAODJet)
+                     LINK_LIBRARIES L1CaloFEXSimLib )
 
 # 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 )

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/python/eFEXDriverConfig.py

-from L1CaloFEXSim.L1CaloFEXSimConf import LVL1__eFEXSim
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from L1CaloFEXSim.L1CaloFEXSimConf import LVL1__eFEXDriver
 
 class Run3eFEXDriver (LVL1__eFEXDriver):
     __slots__ = []

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/components/eFEXDriver_entries.cxx

@@ -2,7 +2,6 @@
     Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-
 #include "L1CaloFEXSim/eFEXDriver.h"
 #include "L1CaloFEXSim/eFEXSysSim.h"
 #include "L1CaloFEXSim/eFEXSim.h"
@@ -11,8 +10,6 @@
 #include "L1CaloFEXSim/eFEXegAlgo.h"
 #include "L1CaloFEXSim/eFEXNtupleWriter.h"
 
-//#include "GaudiKernel/DeclareFactoryEntries.h"
-
 using namespace LVL1;
 
 DECLARE_COMPONENT(eFEXDriver)
@@ -24,13 +21,3 @@ DECLARE_COMPONENT(eFEXFPGA)
 DECLARE_COMPONENT(eFEXtauAlgo)
 DECLARE_COMPONENT(eFEXegAlgo)
 DECLARE_COMPONENT(eFEXNtupleWriter)
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-//   component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-//   by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-//   by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information

Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/components/eFEXDriver_load.cxx

-/*
-    Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(eFEXDriver)
-LOAD_FACTORY_ENTRIES(eFEXNtupleWriter)
-  //Notes:
-  //
-  //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
-  //   component library (libXXX.so).
-  //
-  // See Athena User Guide for more information

Trigger/TrigT1/L1CaloFEXToolInterfaces/CMakeLists.txt

-################################################################################
-# Package: L1CaloFEXToolInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1CaloFEXToolInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps 
-			  GaudiKernal
-			  )
-
 atlas_add_library( L1CaloFEXToolInterfaces
+                   L1CaloFEXToolInterfaces/*.h
+                   INTERFACE
                    PUBLIC_HEADERS L1CaloFEXToolInterfaces
-                   LINK_LIBRARIES AthenaBaseComps CaloEvent xAODTrigL1Calo CaloIdentifier )#GaudiKernal )
+                   LINK_LIBRARIES AthenaBaseComps CaloEvent CaloIdentifier GaudiKernel L1CaloFEXSimLib xAODTrigL1Calo )