From 4e8c5c5b9be7eb68143bc7d078b23f67a4180782 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 15:47:39 +0800
Subject: [PATCH] WIP: avoid the set variables. specify the sources directly.
---
Analysis/TotalInvMass/CMakeLists.txt | 4 +-
Detector/DetCEPCv4/CMakeLists.txt | 37 ++++----
Detector/DetCRD/CMakeLists.txt | 8 +-
Detector/DetDriftChamber/CMakeLists.txt | 6 +-
Detector/DetEcalMatrix/CMakeLists.txt | 7 +-
Digitisers/DCHDigi/CMakeLists.txt | 6 +-
Digitisers/G2CDArbor/CMakeLists.txt | 4 +-
Digitisers/SimHitMerge/CMakeLists.txt | 4 +-
Digitisers/SimpleDigi/CMakeLists.txt | 8 +-
Examples/CMakeLists.txt | 18 ++--
Generator/CMakeLists.txt | 27 +++---
Reconstruction/DCHDedx/CMakeLists.txt | 6 +-
Service/EventSeeder/CMakeLists.txt | 14 ++-
Service/GearSvc/CMakeLists.txt | 1 +
Service/TrackSystemSvc/CMakeLists.txt | 29 ++----
Simulation/DetSimAna/CMakeLists.txt | 5 +-
Simulation/DetSimCore/CMakeLists.txt | 24 ++---
Simulation/DetSimDedx/CMakeLists.txt | 8 +-
Simulation/DetSimFastModel/CMakeLists.txt | 8 +-
Simulation/DetSimGeom/CMakeLists.txt | 8 +-
Simulation/DetSimInterface/CMakeLists.txt | 5 +-
Simulation/DetSimSD/CMakeLists.txt | 19 ++--
Utilities/DataHelper/CMakeLists.txt | 35 +++----
Utilities/KiTrack/CMakeLists.txt | 108 ++++++++++------------
24 files changed, 163 insertions(+), 236 deletions(-)
diff --git a/Analysis/TotalInvMass/CMakeLists.txt b/Analysis/TotalInvMass/CMakeLists.txt
index 6aaf10b6..779dc0c3 100644
--- a/Analysis/TotalInvMass/CMakeLists.txt
+++ b/Analysis/TotalInvMass/CMakeLists.txt
@@ -5,10 +5,8 @@ find_package(GSL REQUIRED )
find_package(LCIO REQUIRED )
find_package(k4FWCore REQUIRED)
-set(TotalInvMass_srcs src/TotalInvMass.cc)
-
gaudi_add_module(TotalInvMass
- SOURCES ${TotalInvMass_srcs}
+ SOURCES src/TotalInvMass.cc
LINK k4FWCore::k4FWCore
Gaudi::GaudiKernel
Gaudi::GaudiAlgLib
diff --git a/Detector/DetCEPCv4/CMakeLists.txt b/Detector/DetCEPCv4/CMakeLists.txt
index cd3e8eee..af544b5a 100644
--- a/Detector/DetCEPCv4/CMakeLists.txt
+++ b/Detector/DetCEPCv4/CMakeLists.txt
@@ -16,27 +16,24 @@ find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCEPCv4)
-set(DetCEPCv4_src
- src/tracker/VXD04_geo.cpp
- src/tracker/FTD_Simple_Staggered_geo.cpp
- src/tracker/FTD_cepc_geo.cpp
- src/tracker/SIT_Simple_Pixel_geo.cpp
- src/tracker/SIT_Simple_Planar_geo.cpp
- src/tracker/TPC10_geo.cpp
- src/tracker/SET_Simple_Planar_geo.cpp
- src/calorimeter/SEcal05_Helpers.cpp
- src/calorimeter/SEcal05_Barrel.cpp
- src/calorimeter/SEcal05_Endcaps.cpp
- src/calorimeter/SEcal05_ECRing.cpp
- src/calorimeter/SHcalRpc01_Barrel.cpp
- src/calorimeter/SHcalRpc01_Endcaps.cpp
- src/calorimeter/SHcalRpc01_EndcapRing.cpp
- src/other/BoxSupport_o1_v01_geo.cpp
- src/other/TubeSupport_o1_v01_geo.cpp
-)
-
gaudi_add_module(DetCEPCv4
- SOURCES ${DetCEPCv4_src}
+ SOURCES src/tracker/VXD04_geo.cpp
+ src/tracker/FTD_Simple_Staggered_geo.cpp
+ src/tracker/FTD_cepc_geo.cpp
+ src/tracker/SIT_Simple_Pixel_geo.cpp
+ src/tracker/SIT_Simple_Planar_geo.cpp
+ src/tracker/TPC10_geo.cpp
+ src/tracker/SET_Simple_Planar_geo.cpp
+ src/calorimeter/SEcal05_Helpers.cpp
+ src/calorimeter/SEcal05_Barrel.cpp
+ src/calorimeter/SEcal05_Endcaps.cpp
+ src/calorimeter/SEcal05_ECRing.cpp
+ src/calorimeter/SHcalRpc01_Barrel.cpp
+ src/calorimeter/SHcalRpc01_Endcaps.cpp
+ src/calorimeter/SHcalRpc01_EndcapRing.cpp
+ src/other/BoxSupport_o1_v01_geo.cpp
+ src/other/TubeSupport_o1_v01_geo.cpp
+
LINK ${DD4hep_COMPONENT_LIBRARIES}
)
diff --git a/Detector/DetCRD/CMakeLists.txt b/Detector/DetCRD/CMakeLists.txt
index cdd7cb13..55e33178 100644
--- a/Detector/DetCRD/CMakeLists.txt
+++ b/Detector/DetCRD/CMakeLists.txt
@@ -15,13 +15,9 @@ find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCRD)
-set(DetCRD_src
- src/Calorimeter/CRDEcal.cpp
- src/Other/CRDBeamPipe_v01_geo.cpp
-)
-
gaudi_add_module(DetCRD
- SOURCES ${DetCRD_src}
+ SOURCES src/Calorimeter/CRDEcal.cpp
+ src/Other/CRDBeamPipe_v01_geo.cpp
LINK ${DD4hep_COMPONENT_LIBRARIES}
)
diff --git a/Detector/DetDriftChamber/CMakeLists.txt b/Detector/DetDriftChamber/CMakeLists.txt
index 4a609ce2..fbf8e01c 100644
--- a/Detector/DetDriftChamber/CMakeLists.txt
+++ b/Detector/DetDriftChamber/CMakeLists.txt
@@ -14,12 +14,8 @@ find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetDriftChamber)
-set(DetDriftChamber_src
- src/driftchamber/DriftChamber.cpp
-)
-
gaudi_add_module(DetDriftChamber
- SOURCES ${DetDriftChamber_src}
+ SOURCES src/driftchamber/DriftChamber.cpp
LINK DetSegmentation
${DD4hep_COMPONENT_LIBRARIES}
# ROOT Geant4
diff --git a/Detector/DetEcalMatrix/CMakeLists.txt b/Detector/DetEcalMatrix/CMakeLists.txt
index 1eb21d7c..10b59035 100644
--- a/Detector/DetEcalMatrix/CMakeLists.txt
+++ b/Detector/DetEcalMatrix/CMakeLists.txt
@@ -15,13 +15,8 @@ find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
# TODO: how to handle
# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetEcalMatrix)
-
-set(DetEcalMatrix_src
- src/calorimeter/EcalMatrix.cpp
-)
-
gaudi_add_module(DetEcalMatrix
- SOURCES ${DetEcalMatrix_src}
+ SOURCES src/calorimeter/EcalMatrix.cpp
LINK ${DD4hep_COMPONENT_LIBRARIES}
# ROOT Geant4
)
diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt
index 9e5cebe1..9cc17c8c 100644
--- a/Digitisers/DCHDigi/CMakeLists.txt
+++ b/Digitisers/DCHDigi/CMakeLists.txt
@@ -6,13 +6,9 @@ find_package(EDM4HEP REQUIRED )
find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED)
-set(DCHDigi_srcs
- src/DCHDigiAlg.cpp
-)
-
## Modules
gaudi_add_module(DCHDigi
- SOURCES ${DCHDigi_srcs}
+ SOURCES src/DCHDigiAlg.cpp
LINK DetInterface
DetSegmentation
k4FWCore::k4FWCore
diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitisers/G2CDArbor/CMakeLists.txt
index 0d3e32a6..fe75a60e 100644
--- a/Digitisers/G2CDArbor/CMakeLists.txt
+++ b/Digitisers/G2CDArbor/CMakeLists.txt
@@ -7,11 +7,9 @@ find_package(GSL REQUIRED )
find_package(LCIO REQUIRED )
find_package(k4FWCore REQUIRED)
-set(G2CDArbor_srcs src/G2CDArborAlg.cpp)
-
# Modules
gaudi_add_module(G2CDArbor
- SOURCES ${G2CDArbor_srcs}
+ SOURCES src/G2CDArborAlg.cpp
LINK k4FWCore::k4FWCore
GearSvc
DetInterface
diff --git a/Digitisers/SimHitMerge/CMakeLists.txt b/Digitisers/SimHitMerge/CMakeLists.txt
index d61282d4..1a07af89 100644
--- a/Digitisers/SimHitMerge/CMakeLists.txt
+++ b/Digitisers/SimHitMerge/CMakeLists.txt
@@ -3,11 +3,9 @@ find_package(DD4hep COMPONENTS DDG4 REQUIRED)
find_package(EDM4HEP REQUIRED)
find_package(k4FWCore REQUIRED)
-set(SimHitMergeAlg_srcs src/SimHitMergeAlg.cpp)
-
# Modules
gaudi_add_module(SimHitMerge
- SOURCES ${SimHitMergeAlg_srcs}
+ SOURCES src/SimHitMergeAlg.cpp
LINK DetInterface
k4FWCore::k4FWCore
Gaudi::GaudiKernel
diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitisers/SimpleDigi/CMakeLists.txt
index 43434af1..85862c3e 100644
--- a/Digitisers/SimpleDigi/CMakeLists.txt
+++ b/Digitisers/SimpleDigi/CMakeLists.txt
@@ -6,13 +6,11 @@ find_package(LCIO REQUIRED )
find_package(k4FWCore REQUIRED)
find_package(EDM4HEP REQUIRED)
-set(SimpleDigi_srcs src/PlanarDigiAlg.cpp
- src/TPCDigiAlg.cpp
- src/voxel.cpp)
-
# Modules
gaudi_add_module(SimpleDigi
- SOURCES ${SimpleDigi_srcs}
+ SOURCES src/PlanarDigiAlg.cpp
+ src/TPCDigiAlg.cpp
+ src/voxel.cpp
LINK GearSvc
EventSeeder
TrackSystemSvcLib
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index 02613ead..e71a4770 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -5,21 +5,17 @@ find_package(EDM4HEP REQUIRED)
find_package(k4FWCore REQUIRED)
find_package(DD4hep COMPONENTS DDRec DDParsers REQUIRED)
-set(Examples_srcs
- src/HelloWorld/HelloAlg.cpp
- src/FirstSvc/FirstSvc.cpp
- src/SecondAlg/SecondAlg.cpp
- src/Edm4hepTest/Edm4hepReadAlg.cpp
- src/Edm4hepTest/Edm4hepReadDCAlg.cpp
- src/Edm4hepTest/Edm4hepWriteAlg.cpp
- src/DumpIDAlg/DumpIDAlg.cpp
-)
-
# Headers and Libraries
# Modules
gaudi_add_module(Examples
- SOURCES ${Examples_srcs}
+ SOURCES src/HelloWorld/HelloAlg.cpp
+ src/FirstSvc/FirstSvc.cpp
+ src/SecondAlg/SecondAlg.cpp
+ src/Edm4hepTest/Edm4hepReadAlg.cpp
+ src/Edm4hepTest/Edm4hepReadDCAlg.cpp
+ src/Edm4hepTest/Edm4hepWriteAlg.cpp
+ src/DumpIDAlg/DumpIDAlg.cpp
LINK DetInterface
k4FWCore::k4FWCore
Gaudi::GaudiAlgLib Gaudi::GaudiKernel
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 49a87c51..effac5ce 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -1,19 +1,5 @@
########################################
-set(GenAlgo_srcs
- src/IGenTool.cpp
- src/GenAlgo.cpp
- src/GenEvent.cpp
- src/GenReader.cpp
- src/StdHepRdr.cpp
- src/GenPrinter.cpp
- # src/LCAscHepRdr.cc
- # src/HepevtRdr.cpp
- src/SLCIORdr.cpp
- src/HepMCRdr.cpp
- src/GtGunTool.cpp
-)
-
find_package(Geant4 REQUIRED)
include(${Geant4_USE_FILE})
@@ -42,7 +28,18 @@ if(CLHEP_FOUND)
endif(CLHEP_FOUND)
gaudi_add_module(GenAlgo
- SOURCES ${GenAlgo_srcs}
+ SOURCES src/IGenTool.cpp
+ src/GenAlgo.cpp
+ src/GenEvent.cpp
+ src/GenReader.cpp
+ src/StdHepRdr.cpp
+ src/GenPrinter.cpp
+ # src/LCAscHepRdr.cc
+ # src/HepevtRdr.cpp
+ src/SLCIORdr.cpp
+ src/HepMCRdr.cpp
+ src/GtGunTool.cpp
+
LINK ${ROOT_LIBRARIES}
k4FWCore::k4FWCore
Gaudi::GaudiAlgLib
diff --git a/Reconstruction/DCHDedx/CMakeLists.txt b/Reconstruction/DCHDedx/CMakeLists.txt
index 9d1fd08f..2f207185 100644
--- a/Reconstruction/DCHDedx/CMakeLists.txt
+++ b/Reconstruction/DCHDedx/CMakeLists.txt
@@ -3,13 +3,9 @@ find_package(k4FWCore)
find_package(EDM4HEP REQUIRED )
find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-set(srcs
- src/RecDCHDedxAlg.cpp
-)
-
# Modules
gaudi_add_module(DCHDedx
- SOURCES ${srcs}
+ SOURCES src/RecDCHDedxAlg.cpp
LINK DetSimInterface
DetInterface
DetSegmentation
diff --git a/Service/EventSeeder/CMakeLists.txt b/Service/EventSeeder/CMakeLists.txt
index 7d73ab62..3c45a746 100644
--- a/Service/EventSeeder/CMakeLists.txt
+++ b/Service/EventSeeder/CMakeLists.txt
@@ -1,12 +1,16 @@
-set(EventSeeder_srcs
- src/MarlinEvtSeeder.cpp
-)
-
gaudi_add_header_only_library(EventSeeder)
gaudi_add_module(EventSeederPlugins
- SOURCES ${EventSeeder_srcs}
+ SOURCES src/MarlinEvtSeeder.cpp
LINK EventSeeder
Gaudi::GaudiKernel
)
+
+install(TARGETS EventSeeder EventSeederPlugins
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
+
+
diff --git a/Service/GearSvc/CMakeLists.txt b/Service/GearSvc/CMakeLists.txt
index b84ea097..d8edef67 100644
--- a/Service/GearSvc/CMakeLists.txt
+++ b/Service/GearSvc/CMakeLists.txt
@@ -1,5 +1,6 @@
find_package(GEAR REQUIRED)
+
find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
gaudi_add_header_only_library(GearSvc)
diff --git a/Service/TrackSystemSvc/CMakeLists.txt b/Service/TrackSystemSvc/CMakeLists.txt
index 1d100cdb..44b3eb9c 100644
--- a/Service/TrackSystemSvc/CMakeLists.txt
+++ b/Service/TrackSystemSvc/CMakeLists.txt
@@ -9,25 +9,16 @@ find_package(EDM4HEP REQUIRED)
#find_package(KalDet REQUIRED)
find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-set(TrackSystemSvc_srcs src/TrackSystemSvc.cpp)
-set(TrackSystemSvcLib_srcs
- src/HelixFit.cc
- src/HelixTrack.cc
- src/IMarlinTrack.cc
- src/IMarlinTrkSystem.cc
- src/LCIOTrackPropagators.cc
- src/MarlinKalTest.cc
- src/MarlinKalTestTrack.cc
- src/MarlinTrkUtils.cc
-)
-
-# gaudi_install_headers(TrackSystemSvc)
-
-#message( "${INCLUDE_DIRS}" )
-#message( "${LINK_LIBRARIES}" )
-
gaudi_add_library(TrackSystemSvcLib
- SOURCES ${TrackSystemSvcLib_srcs}
+ SOURCES src/HelixFit.cc
+ src/HelixTrack.cc
+ src/IMarlinTrack.cc
+ src/IMarlinTrkSystem.cc
+ src/LCIOTrackPropagators.cc
+ src/MarlinKalTest.cc
+ src/MarlinKalTestTrack.cc
+ src/MarlinTrkUtils.cc
+
LINK DataHelperLib
KalTestLib
KalDetLib
@@ -41,7 +32,7 @@ gaudi_add_library(TrackSystemSvcLib
)
gaudi_add_module(TrackSystemSvc
- SOURCES ${TrackSystemSvc_srcs}
+ SOURCES src/TrackSystemSvc.cpp
LINK TrackSystemSvcLib
Gaudi::GaudiKernel
${GEAR_LIBRARIES}
diff --git a/Simulation/DetSimAna/CMakeLists.txt b/Simulation/DetSimAna/CMakeLists.txt
index 242dbc5a..01b4d5d6 100644
--- a/Simulation/DetSimAna/CMakeLists.txt
+++ b/Simulation/DetSimAna/CMakeLists.txt
@@ -6,12 +6,9 @@ find_package(DD4hep COMPONENTS DDG4 REQUIRED)
# For EDM & I/O
find_package(EDM4HEP REQUIRED)
-set(DetSimAna_srcs
- src/Edm4hepWriterAnaElemTool.cpp
-)
gaudi_add_module(DetSimAna
- SOURCES ${DetSimAna_srcs}
+ SOURCES src/Edm4hepWriterAnaElemTool.cpp
LINK DetSimInterface
${DD4hep_COMPONENT_LIBRARIES}
Gaudi::GaudiKernel
diff --git a/Simulation/DetSimCore/CMakeLists.txt b/Simulation/DetSimCore/CMakeLists.txt
index 92e5dfda..e9ae024a 100644
--- a/Simulation/DetSimCore/CMakeLists.txt
+++ b/Simulation/DetSimCore/CMakeLists.txt
@@ -5,23 +5,19 @@ include(${Geant4_USE_FILE})
find_package(EDM4HEP REQUIRED)
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-set(DetSimCore_srcs
- src/DetSimAlg.cpp
- src/DetSimSvc.cpp
- src/DetectorConstruction.cpp
- src/PrimaryGeneratorAction.cpp
- src/G4PrimaryCnvTool.cpp
- src/ActionInitialization.cpp
- src/RunAction.cpp
- src/EventAction.cpp
- src/TrackingAction.cpp
- src/SteppingAction.cpp
-)
-
message(" Geant4_LIBRARIES: ${Geant4_LIBRARIES}")
gaudi_add_module(DetSimCore
- SOURCES ${DetSimCore_srcs}
+ SOURCES src/DetSimAlg.cpp
+ src/DetSimSvc.cpp
+ src/DetectorConstruction.cpp
+ src/PrimaryGeneratorAction.cpp
+ src/G4PrimaryCnvTool.cpp
+ src/ActionInitialization.cpp
+ src/RunAction.cpp
+ src/EventAction.cpp
+ src/TrackingAction.cpp
+ src/SteppingAction.cpp
LINK DetSimInterface
Gaudi::GaudiKernel
${Geant4_LIBRARIES}
diff --git a/Simulation/DetSimDedx/CMakeLists.txt b/Simulation/DetSimDedx/CMakeLists.txt
index 79033891..d421d947 100644
--- a/Simulation/DetSimDedx/CMakeLists.txt
+++ b/Simulation/DetSimDedx/CMakeLists.txt
@@ -6,13 +6,13 @@ find_package(EDM4HEP REQUIRED )
include_directories(${EDM4HEP_INCLUDE_DIR})
set(DetSimDedx_srcs
- src/DummyDedxSimTool.cpp
- src/BetheBlochEquationDedxSimTool.cpp
- src/GFDndxSimTool.cpp
)
gaudi_add_module(DetSimDedx
- SOURCES ${DetSimDedx_srcs}
+ SOURCES src/DummyDedxSimTool.cpp
+ src/BetheBlochEquationDedxSimTool.cpp
+ src/GFDndxSimTool.cpp
+
LINK DetSimInterface
${DD4hep_COMPONENT_LIBRARIES}
Gaudi::GaudiKernel
diff --git a/Simulation/DetSimFastModel/CMakeLists.txt b/Simulation/DetSimFastModel/CMakeLists.txt
index d68d6ac1..420b93f0 100644
--- a/Simulation/DetSimFastModel/CMakeLists.txt
+++ b/Simulation/DetSimFastModel/CMakeLists.txt
@@ -3,13 +3,9 @@ find_package(Geant4 REQUIRED ui_all vis_all)
include(${Geant4_USE_FILE})
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-set(DetSimFastModel_srcs
- src/DummyFastSimG4Tool.cpp
- src/DummyFastSimG4Model.cpp
-)
-
gaudi_add_module(DetSimFastModel
- SOURCES ${DetSimFastModel_srcs}
+ SOURCES src/DummyFastSimG4Tool.cpp
+ src/DummyFastSimG4Model.cpp
LINK DetSimInterface
${DD4hep_COMPONENT_LIBRARIES}
Gaudi::GaudiKernel
diff --git a/Simulation/DetSimGeom/CMakeLists.txt b/Simulation/DetSimGeom/CMakeLists.txt
index 87ffb2b1..f9cf4b54 100644
--- a/Simulation/DetSimGeom/CMakeLists.txt
+++ b/Simulation/DetSimGeom/CMakeLists.txt
@@ -3,13 +3,9 @@ find_package(Geant4 REQUIRED ui_all vis_all)
include(${Geant4_USE_FILE})
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
-set(DetSimGeom_srcs
- src/WorldDetElemTool.cpp
- src/AnExampleDetElemTool.cpp
-)
-
gaudi_add_module(DetSimGeom
- SOURCES ${DetSimGeom_srcs}
+ SOURCES src/WorldDetElemTool.cpp
+ src/AnExampleDetElemTool.cpp
LINK DetSimInterface
DetInterface
${DD4hep_COMPONENT_LIBRARIES}
diff --git a/Simulation/DetSimInterface/CMakeLists.txt b/Simulation/DetSimInterface/CMakeLists.txt
index 19e1a920..ed99eead 100644
--- a/Simulation/DetSimInterface/CMakeLists.txt
+++ b/Simulation/DetSimInterface/CMakeLists.txt
@@ -1,12 +1,9 @@
# DetSimInterface (headers only)
-set(DetSimInterface_srcs
- src/IDetSimSvc.cpp
-)
gaudi_add_library(DetSimInterface
- SOURCES ${DetSimInterface_srcs}
+ SOURCES src/IDetSimSvc.cpp
LINK Gaudi::GaudiKernel
)
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index 82de5e1b..b6b81ee1 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -4,20 +4,19 @@ include(${Geant4_USE_FILE})
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
set(DetSimSD_srcs
- src/CalorimeterSensDetTool.cpp
+)
- src/DDG4SensitiveDetector.cpp
- src/CaloSensitiveDetector.cpp
+gaudi_add_module(DetSimSD
+ SOURCES src/CalorimeterSensDetTool.cpp
+ src/DDG4SensitiveDetector.cpp
+ src/CaloSensitiveDetector.cpp
- src/DriftChamberSensDetTool.cpp
- src/DriftChamberSensitiveDetector.cpp
+ src/DriftChamberSensDetTool.cpp
+ src/DriftChamberSensitiveDetector.cpp
- src/TimeProjectionChamberSensDetTool.cpp
- src/TimeProjectionChamberSensitiveDetector.cpp
-)
+ src/TimeProjectionChamberSensDetTool.cpp
+ src/TimeProjectionChamberSensitiveDetector.cpp
-gaudi_add_module(DetSimSD
- SOURCES ${DetSimSD_srcs}
LINK DetSimInterface
DetInterface
${DD4hep_COMPONENT_LIBRARIES}
diff --git a/Utilities/DataHelper/CMakeLists.txt b/Utilities/DataHelper/CMakeLists.txt
index 06aa44f7..5300866d 100644
--- a/Utilities/DataHelper/CMakeLists.txt
+++ b/Utilities/DataHelper/CMakeLists.txt
@@ -5,29 +5,24 @@ find_package(GSL REQUIRED )
message("GSL: ${GSL_LIBRARIES} ")
message("GSL INCLUDE_DIRS: ${GSL_INCLUDE_DIRS} ")
-# gaudi_depends_on_subdirs()
-
-set(DataHelperLib_srcs
- src/CaloHitExtended.cc
- src/Circle.cc
- src/ClusterExtended.cc
- src/ClusterShapes.cc
- src/GroupTracks.cc
- src/HelixClass.cc
- src/LCCylinder.cc
- src/LCLine3D.cc
- src/LCPlane3D.cc
- src/LineClass.cc
- src/Navigation.cpp
- src/SimpleHelix.cc
- src/TrackerHitExtended.cc
- src/TrackExtended.cc
- src/TrackHitPair.cc)
-
#gaudi_install_headers(DataHelper)
gaudi_add_library(DataHelperLib
- SOURCES ${DataHelperLib_srcs}
+ SOURCES src/CaloHitExtended.cc
+ src/Circle.cc
+ src/ClusterExtended.cc
+ src/ClusterShapes.cc
+ src/GroupTracks.cc
+ src/HelixClass.cc
+ src/LCCylinder.cc
+ src/LCLine3D.cc
+ src/LCPlane3D.cc
+ src/LineClass.cc
+ src/Navigation.cpp
+ src/SimpleHelix.cc
+ src/TrackerHitExtended.cc
+ src/TrackExtended.cc
+ src/TrackHitPair.cc
LINK EDM4HEP::edm4hep
EDM4HEP::edm4hepDict
${GSL_LIBRARIES}
diff --git a/Utilities/KiTrack/CMakeLists.txt b/Utilities/KiTrack/CMakeLists.txt
index bf3a35e3..a56283d6 100644
--- a/Utilities/KiTrack/CMakeLists.txt
+++ b/Utilities/KiTrack/CMakeLists.txt
@@ -7,67 +7,61 @@ find_package(EDM4HEP REQUIRED)
find_package(LCIO REQUIRED)
find_package(DD4hep COMPONENTS DDCore DDRec REQUIRED)
-# gaudi_depends_on_subdirs(Service/TrackSystemSvc Utilities/DataHelper)
-
-set(KiTrackLib_srcs
- src/KiTrack/Automaton.cc
- src/KiTrack/HopfieldNeuralNet.cc
- src/KiTrack/IHit.cc
- src/KiTrack/SegmentBuilder.cc
- src/KiTrack/Segment.cc
+gaudi_add_library(KiTrackLib
+ SOURCES src/KiTrack/Automaton.cc
+ src/KiTrack/HopfieldNeuralNet.cc
+ src/KiTrack/IHit.cc
+ src/KiTrack/SegmentBuilder.cc
+ src/KiTrack/Segment.cc
- src/Criteria/Crit2_DeltaPhi.cc
- src/Criteria/Crit2_DeltaPhi_MV.cc
- src/Criteria/Crit2_DeltaRho.cc
- src/Criteria/Crit2_DeltaTheta_MV.cc
- src/Criteria/Crit2_Distance_MV.cc
- src/Criteria/Crit2_HelixWithIP.cc
- src/Criteria/Crit2_RZRatio.cc
- src/Criteria/Crit2_StraightTrackRatio.cc
- src/Criteria/Crit3_2DAngle.cc
- src/Criteria/Crit3_2DAngleTimesR.cc
- src/Criteria/Crit3_3DAngle.cc
- src/Criteria/Crit3_3DAngleTimesR.cc
- src/Criteria/Crit3_ChangeRZRatio.cc
- src/Criteria/Crit3_IPCircleDist.cc
- src/Criteria/Crit3_IPCircleDistTimesR.cc
- src/Criteria/Crit3_NoZigZag_MV.cc
- src/Criteria/Crit3_PT.cc
- src/Criteria/Crit3_PT_MV.cc
- src/Criteria/Crit4_2DAngleChange.cc
- src/Criteria/Crit4_3DAngleChange.cc
- src/Criteria/Crit4_3DAngleChangeNormed.cc
- src/Criteria/Crit4_DistOfCircleCenters.cc
- src/Criteria/Crit4_DistToExtrapolation.cc
- src/Criteria/Crit4_NoZigZag.cc
- src/Criteria/Crit4_PhiZRatioChange.cc
- src/Criteria/Crit4_RChange.cc
- src/Criteria/Criteria.cc
- src/Criteria/SimpleCircle.cc
+ src/Criteria/Crit2_DeltaPhi.cc
+ src/Criteria/Crit2_DeltaPhi_MV.cc
+ src/Criteria/Crit2_DeltaRho.cc
+ src/Criteria/Crit2_DeltaTheta_MV.cc
+ src/Criteria/Crit2_Distance_MV.cc
+ src/Criteria/Crit2_HelixWithIP.cc
+ src/Criteria/Crit2_RZRatio.cc
+ src/Criteria/Crit2_StraightTrackRatio.cc
+ src/Criteria/Crit3_2DAngle.cc
+ src/Criteria/Crit3_2DAngleTimesR.cc
+ src/Criteria/Crit3_3DAngle.cc
+ src/Criteria/Crit3_3DAngleTimesR.cc
+ src/Criteria/Crit3_ChangeRZRatio.cc
+ src/Criteria/Crit3_IPCircleDist.cc
+ src/Criteria/Crit3_IPCircleDistTimesR.cc
+ src/Criteria/Crit3_NoZigZag_MV.cc
+ src/Criteria/Crit3_PT.cc
+ src/Criteria/Crit3_PT_MV.cc
+ src/Criteria/Crit4_2DAngleChange.cc
+ src/Criteria/Crit4_3DAngleChange.cc
+ src/Criteria/Crit4_3DAngleChangeNormed.cc
+ src/Criteria/Crit4_DistOfCircleCenters.cc
+ src/Criteria/Crit4_DistToExtrapolation.cc
+ src/Criteria/Crit4_NoZigZag.cc
+ src/Criteria/Crit4_PhiZRatioChange.cc
+ src/Criteria/Crit4_RChange.cc
+ src/Criteria/Criteria.cc
+ src/Criteria/SimpleCircle.cc
+ src/ILDImpl/FTDHit01.cc
+ src/ILDImpl/FTDHitSimple.cc
+ src/ILDImpl/FTDNeighborPetalSecCon.cc
+ src/ILDImpl/FTDSectorConnector.cc
+ src/ILDImpl/FTDTrack.cc
+ src/ILDImpl/MiniVector.cc
+ src/ILDImpl/MiniVectorHit01.cc
+ src/ILDImpl/SectorSystemFTD.cc
+ src/ILDImpl/SectorSystemVXD.cc
+ src/ILDImpl/VXDHit01.cc
+ src/ILDImpl/VXDHitSimple.cc
+ src/ILDImpl/VXDSectorConnector.cc
+ src/ILDImpl/VXDTrack.cc
- src/ILDImpl/FTDHit01.cc
- src/ILDImpl/FTDHitSimple.cc
- src/ILDImpl/FTDNeighborPetalSecCon.cc
- src/ILDImpl/FTDSectorConnector.cc
- src/ILDImpl/FTDTrack.cc
- src/ILDImpl/MiniVector.cc
- src/ILDImpl/MiniVectorHit01.cc
- src/ILDImpl/SectorSystemFTD.cc
- src/ILDImpl/SectorSystemVXD.cc
- src/ILDImpl/VXDHit01.cc
- src/ILDImpl/VXDHitSimple.cc
- src/ILDImpl/VXDSectorConnector.cc
- src/ILDImpl/VXDTrack.cc
+ src/Tools/Fitter.cc
+ src/Tools/FTDHelixFitter.cc
+ src/Tools/KiTrackMarlinTools.cc
+ src/Tools/Timer.cc
- src/Tools/Fitter.cc
- src/Tools/FTDHelixFitter.cc
- src/Tools/KiTrackMarlinTools.cc
- src/Tools/Timer.cc
-)
-
-gaudi_add_library(KiTrackLib
- SOURCES ${KiTrackLib_srcs}
LINK DataHelperLib
TrackSystemSvcLib
${ROOT_LIBRARIES}
--
GitLab