From 570122aec2e61689196ee7e5e141a026c6c18173 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 14:55:36 +0800
Subject: [PATCH] WIP: migrate SimHitMerge.
---
Digitisers/CMakeLists.txt | 2 +-
Digitisers/SimHitMerge/CMakeLists.txt | 28 ++++++++++++---------
Digitisers/SimHitMerge/src/SimHitMergeAlg.h | 2 +-
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/Digitisers/CMakeLists.txt b/Digitisers/CMakeLists.txt
index fbf4d634..210e118b 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 680d80a9..d61282d4 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 8bded1c0..d91de40f 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"
--
GitLab