Merge branch 'l1topo_cmake' into 'master'

L1Topo: Cleanup cmake configuration

See merge request atlas/athena!34179

Trigger/TrigT1/L1Topo/L1TopoAlgorithms/CMakeLists.txt

-################################################################################
-# Package: L1TopoAlgorithms
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoAlgorithms )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Trigger/TrigT1/L1Topo/L1TopoEvent
-   Trigger/TrigT1/L1Topo/L1TopoInterfaces
-   PRIVATE
-   Trigger/TrigT1/L1Topo/L1TopoSimulationUtils )
-
 # External dependencies:
-find_package( Boost )
 find_package( ROOT COMPONENTS Core Hist )
 
 # Make sure that the executable of the package gets linked against all of its
@@ -26,10 +15,8 @@ string( REPLACE "-Wl,--as-needed" "" CMAKE_EXE_LINKER_FLAGS
 atlas_add_library( L1TopoAlgorithms
    L1TopoAlgorithms/*.h Root/*.cxx
    PUBLIC_HEADERS L1TopoAlgorithms
-   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
    LINK_LIBRARIES L1TopoEvent L1TopoInterfaces
-   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES}
-   L1TopoSimulationUtils )
+   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} L1TopoCommon L1TopoSimulationUtils )
 
 atlas_add_executable( TrigConfL1TopoGenPyAlg
    src/test/L1TopoGenPyAlg.cxx

Trigger/TrigT1/L1Topo/L1TopoByteStream/CMakeLists.txt

-################################################################################
-# Package: L1TopoByteStream
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoByteStream )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Event/ByteStreamCnvSvcBase
-                          Event/ByteStreamData
-                          Event/xAOD/xAODTrigL1Calo
-                          Trigger/TrigT1/L1Topo/L1TopoRDO )
-
 # External dependencies:
 find_package( tdaq-common COMPONENTS eformat_write )
 
@@ -25,7 +11,7 @@ atlas_add_component( L1TopoByteStream
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test xAODTrigL1Calo L1TopoRDO )
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel L1TopoRDO StoreGateLib xAODTrigL1Calo )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

Trigger/TrigT1/L1Topo/L1TopoCommon/CMakeLists.txt

-################################################################################
-# Package: L1TopoCommon
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoCommon )
 
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-
 # Component(s) in the package:
 atlas_add_library( L1TopoCommon
                    Root/*.cxx
-                   PUBLIC_HEADERS L1TopoCommon
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} )
-
+                   PUBLIC_HEADERS L1TopoCommon )

Trigger/TrigT1/L1Topo/L1TopoConfig/CMakeLists.txt

-################################################################################
-# Package: L1TopoConfig
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoConfig )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Trigger/TrigConfiguration/TrigConfBase
-                          Trigger/TrigT1/L1Topo/L1TopoCommon )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( cx_Oracle )
+find_package( Boost )
 
 # Component(s) in the package:
 atlas_add_library( L1TopoConfig
                    Root/*.cxx
                    PUBLIC_HEADERS L1TopoConfig
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfBase L1TopoCommon )
+                   LINK_LIBRARIES TrigConfBase L1TopoCommon )
 
 atlas_add_executable( TrigConfTopoReader
                       src/test/TopoReader.cxx
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfBase L1TopoCommon L1TopoConfig )
+                      LINK_LIBRARIES L1TopoConfig )
 
 # Install files from the package:
 atlas_install_xmls( data/*.xml )

Trigger/TrigT1/L1Topo/L1TopoCoreSim/CMakeLists.txt

-################################################################################
-# Package: L1TopoCoreSim
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoCoreSim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Trigger/TrigT1/L1Topo/L1TopoCommon
-                          Trigger/TrigT1/L1Topo/L1TopoConfig
-                          Trigger/TrigT1/L1Topo/L1TopoEvent
-                          Trigger/TrigT1/L1Topo/L1TopoInterfaces
-                          PRIVATE
-                          Trigger/TrigConfiguration/TrigConfBase
-                          Trigger/TrigT1/L1Topo/L1TopoAlgorithms
-                          Trigger/TrigT1/L1Topo/L1TopoHardware )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree pthread RIO Hist MathCore )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core RIO Hist )
 
 # Component(s) in the package:
 atlas_disable_as_needed()
 atlas_add_library( L1TopoCoreSim
                    Root/*.cxx
                    PUBLIC_HEADERS L1TopoCoreSim
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   LINK_LIBRARIES L1TopoCommon L1TopoConfig L1TopoEvent L1TopoInterfaces ${ROOT_LIBRARIES}
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfBase L1TopoAlgorithms L1TopoHardware )
+                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} L1TopoCommon L1TopoConfig L1TopoEvent L1TopoInterfaces TrigConfBase
+                   PRIVATE_LINK_LIBRARIES L1TopoHardware L1TopoAlgorithms )
 
 atlas_add_executable( TrigConfTopoStandAlone
                       src/test/TopoStandAlone.cxx
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} L1TopoCommon L1TopoConfig L1TopoEvent L1TopoInterfaces TrigConfBase L1TopoAlgorithms L1TopoHardware L1TopoCoreSim )
+                      LINK_LIBRARIES L1TopoCoreSim TrigConfBase )
 
 atlas_add_executable( TrigConfTopoTestSteeringConfig
                       src/test/TopoTestSteeringConfig.cxx
-                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} L1TopoCommon L1TopoConfig L1TopoEvent L1TopoInterfaces TrigConfBase L1TopoAlgorithms L1TopoHardware L1TopoCoreSim )
-
+                      LINK_LIBRARIES L1TopoCoreSim )

Trigger/TrigT1/L1Topo/L1TopoEvent/CMakeLists.txt

-################################################################################
-# Package: L1TopoEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Trigger/TrigConfiguration/TrigConfBase
-                          Trigger/TrigT1/L1Topo/L1TopoCommon )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-
 # Component(s) in the package:
 atlas_add_library( L1TopoEvent
                    Root/*.cxx
                    PUBLIC_HEADERS L1TopoEvent
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfBase L1TopoCommon )
-
+                   LINK_LIBRARIES TrigConfBase L1TopoCommon )

Trigger/TrigT1/L1Topo/L1TopoHardware/CMakeLists.txt

-################################################################################
-# Package: L1TopoHardware
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoHardware )
@@ -12,7 +10,8 @@ find_package( Boost )
 atlas_add_library( L1TopoHardware
    L1TopoHardware/*.h Root/*.cxx
    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-   PUBLIC_HEADERS L1TopoHardware )
+   PUBLIC_HEADERS L1TopoHardware
+   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
 
 atlas_add_executable( TrigConfL1TopoGenPyHardware
    src/test/L1TopoGenPyHardware.cxx

Trigger/TrigT1/L1Topo/L1TopoInterfaces/CMakeLists.txt

-################################################################################
-# Package: L1TopoInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Trigger/TrigConfiguration/TrigConfBase
-                          Trigger/TrigT1/L1Topo/L1TopoCommon
-                          Trigger/TrigT1/L1Topo/L1TopoEvent )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree pthread RIO MathCore Hist )
+find_package( ROOT COMPONENTS Core RIO Hist )
 
 # Component(s) in the package:
 atlas_add_library( L1TopoInterfaces
                    Root/*.cxx
                    PUBLIC_HEADERS L1TopoInterfaces
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} TrigConfBase L1TopoCommon L1TopoEvent ${ROOT_LIBRARIES} )
-
+                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES}
+                   LINK_LIBRARIES L1TopoCommon L1TopoEvent TrigConfBase )

Trigger/TrigT1/L1Topo/L1TopoMonitoring/CMakeLists.txt

-################################################################################
-# Package: L1TopoMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoMonitoring )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Trigger/TrigConfiguration/TrigConfInterfaces
-                          Trigger/TrigT1/L1Topo/L1TopoConfig
-                          Trigger/TrigT1/L1Topo/L1TopoRDO
-                          Trigger/TrigT1/TrigT1Result )
-
 # Component(s) in the package:
 atlas_add_component( L1TopoMonitoring
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES AthenaBaseComps GaudiKernel L1TopoConfig L1TopoRDO TrigT1Result )
+                     LINK_LIBRARIES AthenaBaseComps L1TopoConfig L1TopoRDO TrigConfInterfaces TrigT1Result )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

Trigger/TrigT1/L1Topo/L1TopoRDO/CMakeLists.txt

-################################################################################
-# Package: L1TopoRDO
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoRDO )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          AtlasTest/TestTools
-                          Control/AthenaKernel
-                          Control/AthContainers)
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
 
 # Component(s) in the package:
 atlas_add_library( L1TopoRDO
                    src/*.cxx
                    PUBLIC_HEADERS L1TopoRDO
                    PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                   LINK_LIBRARIES TestTools AthContainers AthenaKernel
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
+                   LINK_LIBRARIES AthContainers AthenaKernel )
 
 atlas_add_test( L1TopoRDO_test
                 SOURCES
                 test/L1TopoRDO_test.cxx
-                INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                LINK_LIBRARIES ${Boost_LIBRARIES} TestTools AthContainers AthenaKernel L1TopoRDO )
-
+                LINK_LIBRARIES L1TopoRDO )

Trigger/TrigT1/L1Topo/L1TopoSimulation/CMakeLists.txt

-# $Id: CMakeLists.txt 780947 2016-10-28 10:01:38Z salderwe $
-################################################################################
-# Package: L1TopoSimulation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoSimulation )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PRIVATE
-   Control/AthenaBaseComps
-   Control/AthenaMonitoring
-   GaudiKernel
-   Trigger/TrigConfiguration/TrigConfBase
-   Trigger/TrigConfiguration/TrigConfInterfaces
-   Trigger/TrigConfiguration/TrigConfL1Data
-   Trigger/TrigSteer/TrigInterfaces
-   Trigger/TrigT1/L1Topo/L1TopoConfig
-   Trigger/TrigT1/L1Topo/L1TopoCoreSim
-   Trigger/TrigT1/L1Topo/L1TopoEvent
-   Trigger/TrigT1/L1Topo/L1TopoInterfaces
-   Trigger/TrigT1/TrigT1CaloEvent
-   Trigger/TrigT1/TrigT1CaloUtils
-   Trigger/TrigT1/TrigT1Interfaces
-   Trigger/TrigT1/TrigT1Result )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Hist )
 
@@ -41,17 +19,13 @@ atlas_add_library( L1TopoSimulationLib
 atlas_add_component( L1TopoSimulation
    src/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib
-   TrigInterfacesLib TrigT1CaloEventLib TrigT1CaloUtilsLib
-   AthenaBaseComps GaudiKernel TrigConfBase TrigConfL1Data L1TopoConfig L1TopoSimulationLib
-   L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoAlgorithms TrigT1Interfaces
-   TrigT1Result TrigConfInterfaces )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib L1TopoConfig L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoRDO L1TopoSimulationLib StoreGateLib TrigConfBase TrigConfInterfaces TrigConfL1Data TrigInterfacesLib TrigT1CaloEventLib TrigT1CaloUtilsLib TrigT1Interfaces TrigT1Result xAODTrigCalo xAODTrigger )
 
 atlas_add_component( L1TopoSimulationTest
    src/test/*.h src/test/*.cxx src/test/components/*.cxx src/AthenaL1TopoHistSvc.h src/AthenaL1TopoHistSvc.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoAlgorithms L1TopoSimulationLib)
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel L1TopoConfig L1TopoCoreSim L1TopoEvent L1TopoInterfaces StoreGateLib TrigConfBase TrigConfInterfaces )
 
 # 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/L1Topo/L1TopoSimulationUtils/CMakeLists.txt

-################################################################################
-# Package: L1TopoSimulationUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoSimulationUtils )
 
-# Trigger dependencies
-atlas_depends_on_subdirs(
-   PUBLIC
-   Trigger/TrigT1/L1Topo/L1TopoEvent )
-
 find_package( Boost )
 
 # Component(s) in the package:

Trigger/TrigT1/L1Topo/L1TopoValidation/L1TopoValDataCnv/CMakeLists.txt

-################################################################################
-# Package: L1TopoValDataCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( L1TopoValDataCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Event/xAOD/xAODTrigger
-                          GaudiKernel
-                          Trigger/TrigT1/TrigT1Result )
-
 # Component(s) in the package:
 atlas_add_component( L1TopoValDataCnv
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES TrigSteeringEvent AthenaBaseComps AthenaKernel xAODTrigger GaudiKernel TrigT1Result )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigSteeringEvent TrigT1Result xAODTrigger )