From af4295ab5a4e4b11d381814a739ee4457e7f2d90 Mon Sep 17 00:00:00 2001 From: lintao <lintao51@gmail.com> Date: Wed, 23 Dec 2020 13:37:17 +0800 Subject: [PATCH] WIP: migrate DCHDigi --- CMakeLists.txt | 2 +- Digitisers/CMakeLists.txt | 4 ++++ Digitisers/DCHDigi/CMakeLists.txt | 29 +++++++++++++++-------------- 3 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 Digitisers/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index b6719ff4..8ff8cbce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ endif() add_subdirectory(Analysis) add_subdirectory(Detector) -# add_subdirectory(Digitisers) +add_subdirectory(Digitisers) add_subdirectory(Examples) add_subdirectory(Generator) # add_subdirectory(Reconstruction) diff --git a/Digitisers/CMakeLists.txt b/Digitisers/CMakeLists.txt new file mode 100644 index 00000000..987ea6da --- /dev/null +++ b/Digitisers/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(DCHDigi) +# add_subdirectory(G2DArbor) +# add_subdirectory(SimHigMerge) +# add_subdirectory(SimpleDigi) diff --git a/Digitisers/DCHDigi/CMakeLists.txt b/Digitisers/DCHDigi/CMakeLists.txt index fa9dc143..66df3b32 100644 --- a/Digitisers/DCHDigi/CMakeLists.txt +++ b/Digitisers/DCHDigi/CMakeLists.txt @@ -1,25 +1,26 @@ -gaudi_subdir(DCHDigi v0r0) +find_package(k4FWCore) find_package(CLHEP REQUIRED;CONFIG) find_package(DD4hep COMPONENTS DDG4 REQUIRED) find_package(EDM4HEP REQUIRED ) -include_directories(${EDM4HEP_INCLUDE_DIR}) -find_package(podio REQUIRED ) find_package(ROOT COMPONENTS MathCore Physics GenVector Geom REQUIRED) -set(srcs - src/*.cpp +set(DCHDigi_srcs + src/DCHDigiAlg.cpp ) -gaudi_depends_on_subdirs( - Detector/DetInterface - Detector/DetSegmentation -) ## Modules -gaudi_add_module(DCHDigi ${srcs} - INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep ROOT - LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec ROOT DetSegmentation - -Wl,--no-as-needed - EDM4HEP::edm4hep EDM4HEP::edm4hepDict +gaudi_add_module(DCHDigi + SOURCES ${DCHDigi_srcs} + LINK DetInterface + DetSegmentation + k4FWCore::k4FWCore + Gaudi::GaudiKernel + Gaudi::GaudiAlgLib + ${CLHEP_LIBRARIES} + ${DD4hep_COMPONENT_LIBRARIES} + ${ROOT_LIBRARIES} + DetSegmentation + EDM4HEP::edm4hep EDM4HEP::edm4hepDict ) -- GitLab