From eb23d961fa2e6af72382fdff3824f987a7f4d773 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 14 Oct 2020 10:59:34 +0200
Subject: [PATCH] LUCID: cmake cleanup
- remove `atlas_depends_on_subdirs`
- update library and external dependencies
- enable flake8 where relevant
---
.../LUCID_EventAthenaPool/CMakeLists.txt | 15 +-----
.../LUCID_Cnv/LUCID_EventTPCnv/CMakeLists.txt | 51 +++++--------------
.../LUCID_RawDataByteStreamCnv/CMakeLists.txt | 18 +------
.../LUCID/LUCID_DigiTools/CMakeLists.txt | 11 +---
.../LUCID/LUCID_Digitization/CMakeLists.txt | 6 +--
.../LUCID/LUCID_G4_SD/CMakeLists.txt | 31 +++--------
.../LUCID/LUCID_GeoModel/CMakeLists.txt | 28 ++--------
.../LUCID/LUCID_Identifier/CMakeLists.txt | 13 +----
.../LUCID/LUCID_Monitoring/CMakeLists.txt | 15 ++----
.../LUCID/LUCID_RawEvent/CMakeLists.txt | 20 ++------
.../LUCID_OpProcess/CMakeLists.txt | 20 ++------
.../LUCID_SimEvent/CMakeLists.txt | 20 ++------
12 files changed, 46 insertions(+), 202 deletions(-)
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/CMakeLists.txt
index ba2f41cdfb6..6bc6f280c36 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventAthenaPool/CMakeLists.txt
@@ -1,21 +1,10 @@
-################################################################################
-# Package: LUCID_EventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_EventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv
- ForwardDetectors/LUCID/LUCID_RawEvent
- ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_poolcnv_library( LUCID_EventAthenaPoolPoolCnv
src/*.cxx
FILES LUCID_SimEvent/LUCID_SimHitCollection.h LUCID_RawEvent/LUCID_DigitContainer.h LUCID_RawEvent/LUCID_RawDataContainer.h
- LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_EventTPCnv LUCID_RawEvent LUCID_SimEvent GaudiKernel )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib LUCID_EventTPCnv LUCID_RawEvent GaudiKernel )
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/CMakeLists.txt
index de2377243ce..f9cad0e8123 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_EventTPCnv/CMakeLists.txt
@@ -1,84 +1,57 @@
-################################################################################
-# Package: LUCID_EventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_EventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- ForwardDetectors/LUCID/LUCID_RawEvent
- ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
- Generators/GeneratorObjectsTPCnv
- PRIVATE
- AtlasTest/TestTools
- DetectorDescription/Identifier
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( LUCID_EventTPCnv
src/*.cxx
PUBLIC_HEADERS LUCID_EventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv AthenaPoolCnvSvcLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools Identifier GaudiKernel )
+ PRIVATE_LINK_LIBRARIES Identifier GaudiKernel )
atlas_add_dictionary( LUCID_EventTPCnvDict
LUCID_EventTPCnv/LUCID_EventTPCnvDict.h
LUCID_EventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv )
+# Tests in the package:
atlas_add_test( LUCID_DigitCnv_p1_test
SOURCES
test/LUCID_DigitCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_DigitCnv_p2_test
SOURCES
test/LUCID_DigitCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_DigitContainerCnv_p1_test
SOURCES
test/LUCID_DigitContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_DigitContainerCnv_p2_test
SOURCES
test/LUCID_DigitContainerCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_RawDataCnv_p1_test
SOURCES
test/LUCID_RawDataCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_RawDataContainerCnv_p1_test
SOURCES
test/LUCID_RawDataContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_SimHitCnv_p1_test
SOURCES
test/LUCID_SimHitCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
+ LINK_LIBRARIES AtlasHepMCLib GeneratorObjectsTPCnv LUCID_EventTPCnv TestTools )
atlas_add_test( LUCID_SimHitCnv_p2_test
SOURCES
test/LUCID_SimHitCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities LUCID_RawEvent LUCID_SimEvent GeneratorObjectsTPCnv TestTools Identifier GaudiKernel LUCID_EventTPCnv )
-
+ LINK_LIBRARIES AtlasHepMCLib GeneratorObjectsTPCnv LUCID_EventTPCnv TestTools )
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/CMakeLists.txt
index 826413d34f0..b7eb2d4653b 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: LUCID_RawDataByteStreamCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_RawDataByteStreamCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- ForwardDetectors/LUCID/LUCID_RawEvent
- GaudiKernel )
-
# External dependencies:
find_package( tdaq-common COMPONENTS eformat_write DataWriter )
@@ -23,9 +11,7 @@ atlas_add_component( LUCID_RawDataByteStreamCnv
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test LUCID_RawEvent GaudiKernel )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib ByteStreamCnvSvcBaseLib ByteStreamData LUCID_RawEvent GaudiKernel )
# Install files from the package:
-atlas_install_headers( LUCID_RawDataByteStreamCnv )
atlas_install_joboptions( share/*.py )
-
diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_DigiTools/CMakeLists.txt
index b494b922802..232bc0f066c 100644
--- a/ForwardDetectors/LUCID/LUCID_DigiTools/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_DigiTools/CMakeLists.txt
@@ -1,23 +1,16 @@
-################################################################################
-# Package: LUCID_DigiTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_DigiTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- GaudiKernel )
-
# External dependencies:
find_package( CLHEP )
-find_package( Boost )
# Component(s) in the package:
atlas_add_library( LUCID_DigiTools
src/*.cxx
PUBLIC_HEADERS LUCID_DigiTools
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES}
PRIVATE_LINK_LIBRARIES GaudiKernel )
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt
index 3d8f653c312..27847fea61d 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: LUCID_Digitization
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_Digitization )
@@ -17,6 +15,6 @@ atlas_add_component( LUCID_Digitization
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo LUCID_RawEvent LUCID_SimEvent GaudiKernel GeneratorObjects HitManagement )
# 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 )
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_G4_SD/CMakeLists.txt
index 99dd6d2f5f0..2bf9e146590 100644
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_G4_SD/CMakeLists.txt
@@ -1,45 +1,28 @@
-################################################################################
-# Package: LUCID_G4_SD
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_G4_SD )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/StoreGate
- ForwardDetectors/LUCID/LUCID_GeoModel
- ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent
- Simulation/G4Atlas/G4AtlasTools
- Simulation/HitManagement
- AtlasTest/TestTools
- )
-
# External dependencies:
find_package( CLHEP )
find_package( Geant4 )
-find_package( XercesC )
find_package( GTest )
# Component(s) in the package:
atlas_add_library( LUCID_G4_SDLib
src/*.cxx
- NO_PUBLIC_HEADERS LUCID_G4_SD
- INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CxxUtils StoreGateLib SGtests LUCID_GeoModelLib LUCID_SimEvent G4AtlasToolsLib HitManagement )
+ NO_PUBLIC_HEADERS
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEANT4_LIBRARIES} ${GTEST_LIBRARIES} G4AtlasToolsLib HitManagement LUCID_GeoModelLib LUCID_SimEvent StoreGateLib )
atlas_add_component( LUCID_G4_SD
src/components/*.cxx
- INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel StoreGateLib SGtests LUCID_GeoModelLib LUCID_SimEvent G4AtlasToolsLib HitManagement LUCID_G4_SDLib )
+ LINK_LIBRARIES LUCID_G4_SDLib )
atlas_add_test( LUCID_SensitiveDetector_gtest
SOURCES test/LUCID_SensitiveDetector_gtest.cxx
- INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES TestTools pthread LUCID_G4_SDLib ${GTEST_LIBRARIES} ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CxxUtils StoreGateLib SGtests LUCID_GeoModelLib LUCID_SimEvent G4AtlasToolsLib HitManagement)
+ LINK_LIBRARIES LUCID_G4_SDLib TestTools )
# 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/optionForTest.txt )
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
index 4d6e04eb54a..5130e81fa0d 100644
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/CMakeLists.txt
@@ -1,37 +1,19 @@
-################################################################################
-# Package: LUCID_GeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_GeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoModel/GeoModelUtilities
- GaudiKernel
- PRIVATE
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LUCID_GeoModelLib
src/*.cxx
PUBLIC_HEADERS LUCID_GeoModel
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities GaudiKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools RDBAccessSvcLib )
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
+ PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
atlas_add_component( LUCID_GeoModel
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities GaudiKernel AthenaKernel SGTools StoreGateLib SGtests LUCID_GeoModelLib )
-
+ LINK_LIBRARIES LUCID_GeoModelLib )
diff --git a/ForwardDetectors/LUCID/LUCID_Identifier/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Identifier/CMakeLists.txt
index a27638c5aee..609e4bebfe1 100644
--- a/ForwardDetectors/LUCID/LUCID_Identifier/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Identifier/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: LUCID_Identifier
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_Identifier )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- DetectorDescription/IdDict
- DetectorDescription/Identifier
- PRIVATE
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_library( LUCID_Identifier
src/*.cxx
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt
index 985ca52ac1c..4dfc43b9f37 100644
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt
@@ -1,26 +1,17 @@
-################################################################################
-# Package: LUCID_Monitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_Monitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaMonitoring
- ForwardDetectors/LUCID/LUCID_RawEvent
- PRIVATE
- GaudiKernel )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Hist )
# Component(s) in the package:
atlas_add_component( LUCID_Monitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib LUCID_RawEvent GaudiKernel )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib LUCID_RawEvent )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt
index e283db0004c..2c24d5870e3 100644
--- a/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_RawEvent/CMakeLists.txt
@@ -1,29 +1,15 @@
-################################################################################
-# Package: LUCID_RawEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_RawEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( LUCID_RawEvent
src/*.cxx
PUBLIC_HEADERS LUCID_RawEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES AthContainers AthenaKernel )
atlas_add_dictionary( LUCID_RawEventDict
LUCID_RawEvent/LUCID_RawEventDict.h
LUCID_RawEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers LUCID_RawEvent )
-
+ LINK_LIBRARIES LUCID_RawEvent )
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/CMakeLists.txt
index c0031801b29..56b0ddbd046 100644
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/CMakeLists.txt
@@ -1,29 +1,17 @@
-################################################################################
-# Package: LUCID_OpProcess
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_OpProcess )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Simulation/G4Atlas/G4AtlasInterfaces )
-
# External dependencies:
-find_package( CLHEP )
find_package( Geant4 )
-find_package( XercesC )
# Component(s) in the package:
atlas_add_component( LUCID_OpProcess
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
+ INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEANT4_LIBRARIES} GaudiKernel AthenaBaseComps G4AtlasInterfaces )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/CMakeLists.txt
index 61d829f3b10..45dadd0a59f 100644
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_SimEvent/CMakeLists.txt
@@ -1,34 +1,20 @@
-################################################################################
-# Package: LUCID_SimEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LUCID_SimEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/Identifier
- Generators/GeneratorObjects
- Simulation/HitManagement )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( LUCID_SimEvent
src/*.cxx
PUBLIC_HEADERS LUCID_SimEvent
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel Identifier GeneratorObjects HitManagement
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel Identifier GeneratorObjects HitManagement )
atlas_add_dictionary( LUCID_SimEventDict
LUCID_SimEvent/LUCID_SimEventDict.h
LUCID_SimEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel Identifier GeneratorObjects HitManagement LUCID_SimEvent )
-
+ LINK_LIBRARIES LUCID_SimEvent )
--
GitLab