From 66a449a1a15d2d7b11c3d341cd45606128916aee Mon Sep 17 00:00:00 2001 From: lintao <lintao51@gmail.com> Date: Wed, 23 Dec 2020 15:09:57 +0800 Subject: [PATCH] WIP: migrate SimpleDigi --- Digitisers/CMakeLists.txt | 2 +- Digitisers/SimpleDigi/CMakeLists.txt | 36 ++++++++++++++++++---------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Digitisers/CMakeLists.txt b/Digitisers/CMakeLists.txt index 210e118b..6f6f2e40 100644 --- a/Digitisers/CMakeLists.txt +++ b/Digitisers/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(DCHDigi) add_subdirectory(G2CDArbor) add_subdirectory(SimHitMerge) -# add_subdirectory(SimpleDigi) +add_subdirectory(SimpleDigi) diff --git a/Digitisers/SimpleDigi/CMakeLists.txt b/Digitisers/SimpleDigi/CMakeLists.txt index 052a27df..43434af1 100644 --- a/Digitisers/SimpleDigi/CMakeLists.txt +++ b/Digitisers/SimpleDigi/CMakeLists.txt @@ -1,24 +1,34 @@ -gaudi_subdir(SimpleDigi v0r0) find_package(CLHEP REQUIRED;CONFIG) find_package(GEAR REQUIRED) find_package(GSL REQUIRED ) find_package(LCIO REQUIRED ) -find_package(podio REQUIRED ) find_package(k4FWCore REQUIRED) find_package(EDM4HEP REQUIRED) -gaudi_depends_on_subdirs( - Service/GearSvc - Service/EventSeeder - Service/TrackSystemSvc - Utilities/DataHelper -) - -set(SimpleDigi_srcs src/*.cpp) +set(SimpleDigi_srcs src/PlanarDigiAlg.cpp + src/TPCDigiAlg.cpp + src/voxel.cpp) # Modules -gaudi_add_module(SimpleDigi ${SimpleDigi_srcs} - INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} gear ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS} - LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} ${GEAR_LIBRARIES} ${GSL_LIBRARIES} ${LCIO_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict DataHelperLib +gaudi_add_module(SimpleDigi + SOURCES ${SimpleDigi_srcs} + LINK GearSvc + EventSeeder + TrackSystemSvcLib + DataHelperLib + k4FWCore::k4FWCore + Gaudi::GaudiKernel + Gaudi::GaudiAlgLib + ${CLHEP_LIBRARIES} + ${GEAR_LIBRARIES} + ${GSL_LIBRARIES} + ${LCIO_LIBRARIES} + EDM4HEP::edm4hep EDM4HEP::edm4hepDict ) + +install(TARGETS SimpleDigi + EXPORT CEPCSWTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib + COMPONENT dev) -- GitLab