diff --git a/Analysis/TotalInvMass/CMakeLists.txt b/Analysis/TotalInvMass/CMakeLists.txt
index 6aaf10b657fa4084d11f59baa2cab0ae91e1c17c..779dc0c3c530b582ac027d70f6b58bcb69593ab8 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 cd3e8eee09309dbe0656e65a2b883a4f66b5c719..af544b5a525f85518960a57f679f8d0923a442f7 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 cdd7cb136b75ad9d50c01dc56f51afbd2a9b43e7..55e3317890aa2f7420ac0b7298a9bcb66b631004 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 4a609ce28b5be544182d0a45c81eefb159e765c6..fbf8e01ce18666fac8cda6937368dd0fd605c2b2 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 1eb21d7c0979a4feee25a19f973937aeeef507a7..10b59035d664eb2c7993dfa818738c2bb2541426 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 9e5cebe1ba482bbb559cf56c7d4e0cde7505caae..9cc17c8c9bf54c35c0a12b1086760d4b4a2f9045 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 0d3e32a6ceebaec0cc1243d9b071bba49b0ca1a3..fe75a60e0ddd47fffd9b6b169d62618238753f07 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 d61282d4e7d9d7214413d937556b4b228b66ea64..1a07af8918ea0decefe2466f2411dcc5dad55b8f 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 43434af1397771da8a601908ba71092b9a2c82f8..85862c3e46b099c5bf4f76d36b8a695d99ec96bb 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 02613ead92c981c812a85cdf79370f897d6a1fd2..e71a4770c11e5e969506f2c3af9b1bce05df7088 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 49a87c514bc45a28480b32f119c843e5618ba7e2..effac5cee8e0db181e3a7e10085188e4c1363b0b 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 9d1fd08f9aa245385f9a260a7f104a5d36971c7d..2f2071859166e9e71373c9f285cc505a6ebe7d6b 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 7d73ab625d847bb8ab5efa5ea586a333bc0c04da..3c45a7468265daa6e1b57b60a597becaad5396bd 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 b84ea0972c0c32262a426beb288992304b2abd82..d8edef6755f1d090e9ee4b466238cceb4de994b1 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 1d100cdb0de59ede1be2387ba15eea70fd550e4e..44b3eb9cffacf312c8e1e569ed10777dcfca8ca4 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 242dbc5a49a41c8904a98317485774e7ea559cfa..01b4d5d6d8ddd328e811d071aee25989b7a23835 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 92e5dfdaceb2f52d4b0689c019a276776036d3a8..e9ae024a4e7147c09adae46ab4f45f40d5aecd86 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 79033891cd1cd5b2b537e9e3a8d028898ef296b3..d421d9472faa8282c0d290a874e52ebf00e00e9e 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 d68d6ac1d286e6b1eef4669b019d7fda2cf1a743..420b93f09f758b11df97e745b9ab6e0309681349 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 87ffb2b14f11d3e03446623af84935967b8aca3e..f9cf4b54b0c83135adc7adff93acce8a985a7bce 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 19e1a9202fe8e0873271dcc8605bbbe29430323a..ed99eead6c48943bbe639731e2705a8e70423d31 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 82de5e1bcf097f58be7aa350bfae3e15abf8e6e8..b6b81ee10f482f183b31987daf2067d0a9c531b0 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 06aa44f70cf4b5dc202fc3043afe97045d082968..5300866df62d8a3a0185b84baa59b8068c2ab072 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 bf3a35e30c556a5cbee6627b18b8e5ba4f72cd4e..a56283d602f2fb89e852cd35775c6b7198a22d8d 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}