From c57e394a83e21c52c2526f5f2e5ebb771c09c007 Mon Sep 17 00:00:00 2001 From: lintao <lintao51@gmail.com> Date: Sat, 25 Sep 2021 00:19:16 +0800 Subject: [PATCH] update Abor and Pandora. --- Reconstruction/PFA/Arbor/CMakeLists.txt | 3 +++ Reconstruction/PFA/Arbor/src/BushConnect.hh | 2 +- Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt | 6 +++++- Service/GearSvc/CMakeLists.txt | 4 ++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Reconstruction/PFA/Arbor/CMakeLists.txt b/Reconstruction/PFA/Arbor/CMakeLists.txt index eb4468bd..6508c401 100644 --- a/Reconstruction/PFA/Arbor/CMakeLists.txt +++ b/Reconstruction/PFA/Arbor/CMakeLists.txt @@ -25,6 +25,9 @@ gaudi_add_module(Arbor EDM4HEP::edm4hep EDM4HEP::edm4hepDict ) +target_include_directories(Arbor + PUBLIC ${LCIO_INCLUDE_DIRS} +) install(TARGETS Arbor EXPORT CEPCSWTargets diff --git a/Reconstruction/PFA/Arbor/src/BushConnect.hh b/Reconstruction/PFA/Arbor/src/BushConnect.hh index e0f23ba8..80403feb 100644 --- a/Reconstruction/PFA/Arbor/src/BushConnect.hh +++ b/Reconstruction/PFA/Arbor/src/BushConnect.hh @@ -60,7 +60,7 @@ class BushConnect : public GaudiAlgorithm std::map<edm4hep::ConstTrack, float> Track_Phi; std::map<edm4hep::ConstCluster, int> ClusterType_1stID; - std::map<edm4hep::ReconstructedParticle, int> ChCoreID; + std::map<edm4hep::ConstReconstructedParticle, int> ChCoreID; std::vector<edm4hep::ConstCluster> ecalchcore_tight; //TightCores std::vector<edm4hep::ConstCluster> ecalchcore_medium; diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt index 80307e39..82163d59 100644 --- a/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt +++ b/Reconstruction/PFA/Pandora/GaudiPandora/CMakeLists.txt @@ -26,7 +26,11 @@ gaudi_add_module(GaudiPandora target_include_directories(GaudiPandora PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> + ${GEAR_INCLUDE_DIRS} + ${PandoraSDK_INCLUDE_DIRS} + ${LCContent_INCLUDE_DIRS} +) install(TARGETS GaudiPandora EXPORT CEPCSWTargets diff --git a/Service/GearSvc/CMakeLists.txt b/Service/GearSvc/CMakeLists.txt index a70dae70..ec9a930b 100644 --- a/Service/GearSvc/CMakeLists.txt +++ b/Service/GearSvc/CMakeLists.txt @@ -11,6 +11,10 @@ gaudi_add_module(GearSvcPlugins DetSegmentation ) +target_include_directories(GeomSvc + PUBLIC ${GEAR_INCLUDE_DIRS} +) + install(TARGETS GearSvc GearSvcPlugins EXPORT CEPCSWTargets RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin -- GitLab