From c680a97a887b22922457df4152a7c83c2dca74a3 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Sun, 26 Apr 2020 21:57:57 +0800
Subject: [PATCH] Migrate Generator.
---
Generator/CMakeLists.txt | 31 ++++++++++++++++++-------------
Generator/src/GenAlgo.h | 1 -
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 16be6fa4..f1c10a13 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -23,6 +23,7 @@ find_package(LCIO)
find_package(podio)
find_package(plcio)
find_package(HepMC)
+find_package(CLHEP)
if(ROOT_FOUND)
message("found ROOT: ${ROOT_INCLUDE_DIRS} ${ROOT_LIBRARIES}")
endif(ROOT_FOUND)
@@ -38,29 +39,33 @@ endif(plcio_FOUND)
if(HepMC_FOUND)
message("found HepMC: ${HepMC_INCLUDE_DIRS} ${HepMC_LIBRARY_DIR}")
endif(HepMC_FOUND)
+if(CLHEP_FOUND)
+ message("found CLHEP: ${CLHEP_INCLUDE_DIRS} ${CLHEP_LIBRARY_DIR}")
+endif(CLHEP_FOUND)
############## for producing plcio library #############
INCLUDE_DIRECTORIES(${GenAlgo_incs})
gaudi_add_module(GenAlgo ${GenAlgo_srcs}
INCLUDE_DIRS
- GaudiKernel
+ # GaudiKernel
FWCore
- Geant4
- ${LCIO_INCLUDE_DIRS}
- ${podio_INCLUDE_DIRS}
- ${plcio_INCLUDE_DIRS}
- ${ROOT_INCLUDE_DIRS}
- HepMC
+ # Geant4
+ # ${LCIO_INCLUDE_DIRS}
+ # ${podio_INCLUDE_DIRS}
+ # ${plcio_INCLUDE_DIRS}
+ # ${ROOT_INCLUDE_DIRS}
+ # HepMC
LINK_LIBRARIES
- GaudiKernel
- ${LCIO_LIBRARIES}
- ${podio_LIBRARIES}
+ # GaudiKernel
+ # ${LCIO_LIBRARIES}
+ # ${podio_LIBRARIES}
ROOT
- ${plcio_LIBRARY_DIR}/libplcio.so
- ${plcio_LIBRARY_DIR}/libplcioDict.so
+ # ${plcio_LIBRARY_DIR}/libplcio.so
+ # ${plcio_LIBRARY_DIR}/libplcioDict.so
FWCore
HepMC
- Geant4
+ CLHEP
+ # Geant4
)
#gaudi_add_test(Reader FRAMEWORK options/read.py)
diff --git a/Generator/src/GenAlgo.h b/Generator/src/GenAlgo.h
index 0fd060dc..44c478a0 100644
--- a/Generator/src/GenAlgo.h
+++ b/Generator/src/GenAlgo.h
@@ -21,7 +21,6 @@ using namespace std;
class GenAlgo: public GaudiAlgorithm {
- friend class AlgFactory<GenAlgo>;
public:
GenAlgo(const std::string& name, ISvcLocator* pSvcLocator);
--
GitLab