From 796c037022875d35ba12d3b0b6010fbfd311f014 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 22 Dec 2020 23:37:34 +0800
Subject: [PATCH] WIP: migrate Generator.
---
CMakeLists.txt | 3 +++
Generator/CMakeLists.txt | 26 ++++++++++----------------
Generator/src/GenAlgo.h | 2 +-
Generator/src/GtGunTool.h | 2 +-
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf890d89..b9b1e729 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,9 @@ endif()
add_subdirectory(Analysis)
add_subdirectory(Detector)
+# add_subdirectory(Digitisers)
+# add_subdirectory(Examples)
+add_subdirectory(Generator)
##############################################################################
# INSTALL
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 7eb4c9ca..b520323a 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -1,5 +1,5 @@
########################################
-gaudi_subdir(Generator v0r0)
+
set(GenAlgo_srcs
src/IGenTool.cpp
src/GenAlgo.cpp
@@ -13,7 +13,6 @@ set(GenAlgo_srcs
src/HepMCRdr.cpp
src/GtGunTool.cpp
)
-set(GenAlgo_incs src)
find_package(Geant4 REQUIRED)
include(${Geant4_USE_FILE})
@@ -41,21 +40,16 @@ 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
- k4FWCore
- LINK_LIBRARIES
- ROOT
- k4FWCore
- GaudiAlgLib GaudiKernel
- HepMC
- CLHEP
- LCIO
+gaudi_add_module(GenAlgo
+ SOURCES ${GenAlgo_srcs}
+ LINK ${ROOT_LIBRARIES}
+ k4FWCore::k4FWCore
+ Gaudi::GaudiAlgLib
+ Gaudi::GaudiKernel
+ ${HEPMC_LIBRARIES}
+ ${CLHEP_LIBRARIES}
+ ${LCIO_LIBRARIES}
EDM4HEP::edm4hep EDM4HEP::edm4hepDict
)
-#gaudi_add_test(Reader FRAMEWORK options/read.py)
-###########################
diff --git a/Generator/src/GenAlgo.h b/Generator/src/GenAlgo.h
index cd267453..2eb6ac61 100644
--- a/Generator/src/GenAlgo.h
+++ b/Generator/src/GenAlgo.h
@@ -3,7 +3,7 @@
#include <GaudiKernel/Algorithm.h>
-#include "GaudiKernel/Property.h"
+#include <Gaudi/Property.h>
#include <GaudiKernel/ToolHandle.h>
#include "GaudiAlg/GaudiAlgorithm.h"
diff --git a/Generator/src/GtGunTool.h b/Generator/src/GtGunTool.h
index 0c62f4c3..fa4f8870 100644
--- a/Generator/src/GtGunTool.h
+++ b/Generator/src/GtGunTool.h
@@ -12,7 +12,7 @@
*/
#include <GaudiKernel/AlgTool.h>
-#include <GaudiKernel/Property.h>
+#include <Gaudi/Property.h>
#include "IGenTool.h"
#include <vector>
--
GitLab