From 363f74d28287c2a7355a3cc66a17d52f92d7af8d Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 16:37:53 +0800
Subject: [PATCH] Migrate Digi_Calo.
---
Reconstruction/CMakeLists.txt | 2 +-
Reconstruction/Digi_Calo/CMakeLists.txt | 33 ++++++++++++-------------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Reconstruction/CMakeLists.txt b/Reconstruction/CMakeLists.txt
index 0cbb231c..c491cd6e 100644
--- a/Reconstruction/CMakeLists.txt
+++ b/Reconstruction/CMakeLists.txt
@@ -1,5 +1,5 @@
add_subdirectory(DCHDedx)
-# add_subdirectory(Digi_Calo)
+add_subdirectory(Digi_Calo)
# add_subdirectory(PFA)
# add_subdirectory(SiliconTracking)
# add_subdirectory(Tracking)
diff --git a/Reconstruction/Digi_Calo/CMakeLists.txt b/Reconstruction/Digi_Calo/CMakeLists.txt
index 179346ca..289c5a45 100644
--- a/Reconstruction/Digi_Calo/CMakeLists.txt
+++ b/Reconstruction/Digi_Calo/CMakeLists.txt
@@ -1,26 +1,25 @@
-gaudi_subdir(Digi_Calo v0r0)
find_package(CLHEP REQUIRED;CONFIG)
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
find_package(EDM4HEP REQUIRED )
-message("EDM4HEP_INCLUDE_DIRS: ${EDM4HEP_INCLUDE_DIR}")
-message("EDM4HEP_LIB: ${EDM4HEP_LIBRARIES}")
-include_directories(${EDM4HEP_INCLUDE_DIR})
+find_package(k4FWCore REQUIRED )
find_package(CLHEP REQUIRED)
-find_package(podio REQUIRED )
-set(srcs
- src/*.cpp
-)
-
-gaudi_depends_on_subdirs(
- Detector/DetInterface
-)
## Modules
-gaudi_add_module(Digi_Calo ${srcs}
- INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_INCLUDE_DIR} DD4hep
- LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib ${CLHEP_LIBRARIES} DD4hep ${DD4hep_COMPONENT_LIBRARIES} DDRec
- -Wl,--no-as-needed
- EDM4HEP::edm4hep EDM4HEP::edm4hepDict
+gaudi_add_module(Digi_Calo
+ SOURCES src/CaloDigiAlg.cpp
+ LINK DetInterface
+ k4FWCore::k4FWCore
+ Gaudi::GaudiKernel
+ Gaudi::GaudiAlgLib
+ ${CLHEP_LIBRARIES}
+ ${DD4hep_COMPONENT_LIBRARIES}
+ EDM4HEP::edm4hep EDM4HEP::edm4hepDict
)
+install(TARGETS Digi_Calo
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
+
--
GitLab