diff --git a/Digitisers/CMakeLists.txt b/Digitisers/CMakeLists.txt index fbf4d634847537409a87555e99144addb216933e..210e118beb84b804223355270c92bf5f34830e4a 100644 --- a/Digitisers/CMakeLists.txt +++ b/Digitisers/CMakeLists.txt @@ -1,4 +1,4 @@ add_subdirectory(DCHDigi) add_subdirectory(G2CDArbor) -# add_subdirectory(SimHigMerge) +add_subdirectory(SimHitMerge) # add_subdirectory(SimpleDigi) diff --git a/Digitisers/SimHitMerge/CMakeLists.txt b/Digitisers/SimHitMerge/CMakeLists.txt index 680d80a9dde0329eb068a9b6fd913654495809be..d61282d4e7d9d7214413d937556b4b228b66ea64 100644 --- a/Digitisers/SimHitMerge/CMakeLists.txt +++ b/Digitisers/SimHitMerge/CMakeLists.txt @@ -1,20 +1,24 @@ -gaudi_subdir(SimHitMergeAlg v0r0) find_package(DD4hep COMPONENTS DDG4 REQUIRED) find_package(EDM4HEP REQUIRED) -find_package(podio REQUIRED ) find_package(k4FWCore REQUIRED) -include_directories(${EDM4HEP_INCLUDE_DIR}) - -gaudi_depends_on_subdirs( - Detector/DetInterface -) -set(SimHitMergeAlg_srcs src/*.cpp) +set(SimHitMergeAlg_srcs src/SimHitMergeAlg.cpp) # Modules -gaudi_add_module(SimHitMerge ${SimHitMergeAlg_srcs} - INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib DD4hep - LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib DD4hep DDRec - EDM4HEP::edm4hep EDM4HEP::edm4hepDict +gaudi_add_module(SimHitMerge + SOURCES ${SimHitMergeAlg_srcs} + LINK DetInterface + k4FWCore::k4FWCore + Gaudi::GaudiKernel + Gaudi::GaudiAlgLib + ${DD4hep_COMPONENT_LIBRARIES} + EDM4HEP::edm4hep EDM4HEP::edm4hepDict ) + +install(TARGETS SimHitMerge + EXPORT CEPCSWTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib + COMPONENT dev) + diff --git a/Digitisers/SimHitMerge/src/SimHitMergeAlg.h b/Digitisers/SimHitMerge/src/SimHitMergeAlg.h index 8bded1c038538fdf346c858b4bdfe55c7796a8db..d91de40f0a111a99d9c0ca36f2e9177703e8ff96 100644 --- a/Digitisers/SimHitMerge/src/SimHitMergeAlg.h +++ b/Digitisers/SimHitMerge/src/SimHitMergeAlg.h @@ -3,7 +3,7 @@ #include "k4FWCore/DataHandle.h" #include "GaudiAlg/GaudiAlgorithm.h" -#include "GaudiKernel/Property.h" +#include "Gaudi/Property.h" #include "edm4hep/EventHeader.h" #include "edm4hep/EventHeaderCollection.h" #include "edm4hep/SimCalorimeterHitConst.h"