From 60b15ba99aad137b3582464b64b29f3c30881e77 Mon Sep 17 00:00:00 2001
From: Zhang Yao <zhangyao@ihep.ac.cn>
Date: Tue, 5 Jan 2021 14:41:40 +0800
Subject: [PATCH] Update CMakeLists of RecGenfitAlg
---
Examples/options/sim_fit_CRD.py | 6 +-
Reconstruction/CMakeLists.txt | 1 +
Reconstruction/RecGenfitAlg/CMakeLists.txt | 70 +++++++++++-----------
3 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/Examples/options/sim_fit_CRD.py b/Examples/options/sim_fit_CRD.py
index 93c8615f..d32b990d 100644
--- a/Examples/options/sim_fit_CRD.py
+++ b/Examples/options/sim_fit_CRD.py
@@ -248,9 +248,9 @@ truthTrackerAlg.SiSubsetTrackCollection = "SubsetTracks"
##############################################################################
# RecGenfitAlgSDT
##############################################################################
-#from Configurables import RecGenfitAlgSDT
-#recGenfitAlgSDT = RecGenfitAlgSDT("RecGenfitAlgSDT")
-#recGenfitAlgSDT.debug=10
+from Configurables import RecGenfitAlgSDT
+recGenfitAlgSDT = RecGenfitAlgSDT("RecGenfitAlgSDT")
+recGenfitAlgSDT.debug=10
##############################################################################
# NTupleSvc
diff --git a/Reconstruction/CMakeLists.txt b/Reconstruction/CMakeLists.txt
index e506b90c..6dd63b02 100644
--- a/Reconstruction/CMakeLists.txt
+++ b/Reconstruction/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(Digi_Calo)
add_subdirectory(PFA)
add_subdirectory(SiliconTracking)
add_subdirectory(Tracking)
+add_subdirectory(RecGenfitAlg)
diff --git a/Reconstruction/RecGenfitAlg/CMakeLists.txt b/Reconstruction/RecGenfitAlg/CMakeLists.txt
index fc0966fe..d418760c 100644
--- a/Reconstruction/RecGenfitAlg/CMakeLists.txt
+++ b/Reconstruction/RecGenfitAlg/CMakeLists.txt
@@ -1,40 +1,38 @@
-gaudi_subdir(RecGenfitAlg v0r0)
+# RecGenfitAlg
+gaudi_add_module(RecGenfitAlg
+ SOURCES src/RecGenfitAlgSDT.cpp
+ src/RecGenfitAlgDC.cpp
+ src/GenfitTrack.cpp
+ src/GenfitField.cpp
+ src/GenfitFitter.cpp
+ src/GenfitMaterialInterface.cpp
+ src/GenfitMsg.cpp
+ LINK GearSvc
+# EventSeeder
+# TrackSystemSvcLib
+ Gaudi::GaudiAlgLib
+ Gaudi::GaudiKernel
+ ${GEAR_LIBRARIES}
+ ${GSL_LIBRARIES}
+ ${LCIO_LIBRARIES}
+ DetSegmentation
+ DetInterface
+ DataHelperLib
+ EDM4HEP::edm4hep
+ EDM4HEP::edm4hepDict
+ $ENV{GENFIT_ROOT}/lib64/libgenfit2.so
-find_package(CLHEP REQUIRED;CONFIG)
-find_package(GSL REQUIRED )
-find_package(LCIO REQUIRED )
-find_package(podio REQUIRED )
-find_package(EDM4HEP REQUIRED)
-find_package(ROOT REQUIRED Geom)
-find_package(DD4hep COMPONENTS DDCore DDRec DDParsers REQUIRED)
-
-gaudi_depends_on_subdirs(
- Detector/DetInterface
- Detector/DetSegmentation
- Utilities/DataHelper
)
-set (GenFit_INCLUDE_DIRS $ENV{GENFIT_ROOT}/include)
-set (GenFit_LIB_DIRS $ENV{GENFIT_ROOT}/lib64)
-set (Eigen_INCLUDE_DIRS $ENV{Eigen_ROOT}/include/eigen3)
-
-set(RecGenfitAlg_srcs
- src/RecGenfitAlgSDT.cpp
- src/RecGenfitAlgDC.cpp
- src/GenfitTrack.cpp
- src/GenfitField.cpp
- src/GenfitFitter.cpp
- src/GenfitMaterialInterface.cpp
- src/GenfitMsg.cpp
- )
+target_include_directories(RecGenfitAlg PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ $<BUILD_INTERFACE:$ENV{GENFIT_ROOT}>/include
+ $<INSTALL_INTERFACE:$ENV{GENFIT_ROOT}>/lib64
+)
-# Modules
-gaudi_add_module(RecGenfitAlg ${RecGenfitAlg_srcs}
- INCLUDE_DIRS k4FWCore GaudiKernel GaudiAlgLib CLHEP ROOT gear
- ${GSL_INCLUDE_DIRS} ${LCIO_INCLUDE_DIRS} ${GenFit_INCLUDE_DIRS}
- ${Eigen_INCLUDE_DIRS}
- LINK_LIBRARIES k4FWCore GaudiKernel GaudiAlgLib CLHEP ROOT DataHelperLib
- DetSegmentation $ENV{GEAR}/lib/libgearsurf.so ${GSL_LIBRARIES} ${LCIO_LIBRARIES}
- ${GenFit_LIB_DIRS}/libgenfit2.so DD4hep ${DD4hep_COMPONENT_LIBRARIES}
- -Wl,--no-as-needed EDM4HEP::edm4hep EDM4HEP::edm4hepDict -Wl,--as-needed
- )
+install(TARGETS RecGenfitAlg
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
--
GitLab