From 3f0f0b647a03c31afcc43801de77fc5bc890b754 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Mon, 18 Jul 2022 10:27:09 +0800
Subject: [PATCH] Add library DetSimSDLib so that DetSimSDAna could link it.
---
Simulation/DetSimAna/CMakeLists.txt | 5 +++
.../src/Edm4hepWriterAnaElemTool.cpp | 2 +-
.../DetSimAna/src/ExampleAnaElemTool.cpp | 2 +-
Simulation/DetSimSD/CMakeLists.txt | 35 ++++++++++++-------
.../include/DetSimSD/DDG4SensitiveDetector.h | 2 +-
5 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/Simulation/DetSimAna/CMakeLists.txt b/Simulation/DetSimAna/CMakeLists.txt
index 883dfd82..b1bd935f 100644
--- a/Simulation/DetSimAna/CMakeLists.txt
+++ b/Simulation/DetSimAna/CMakeLists.txt
@@ -5,12 +5,17 @@ include(${Geant4_USE_FILE})
gaudi_add_module(DetSimAna
SOURCES src/Edm4hepWriterAnaElemTool.cpp
LINK DetSimInterface
+ DetSimSDLib
${DD4hep_COMPONENT_LIBRARIES}
Gaudi::GaudiKernel
EDM4HEP::edm4hep EDM4HEP::edm4hepDict
k4FWCore::k4FWCore
)
+target_include_directories(DetSimAna PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
install(TARGETS DetSimAna
EXPORT CEPCSWTargets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
index b05e7994..9de89e94 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
@@ -12,7 +12,7 @@
#include "DDG4/Geant4Mapping.h"
#include "DDG4/Geant4HitCollection.h"
#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4Hits.h"
+#include "DetSimSD/Geant4Hits.h"
DECLARE_COMPONENT(Edm4hepWriterAnaElemTool)
diff --git a/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp b/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
index d912414d..1e11da48 100644
--- a/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
+++ b/Simulation/DetSimAna/src/ExampleAnaElemTool.cpp
@@ -9,7 +9,7 @@
#include "DDG4/Geant4Mapping.h"
#include "DDG4/Geant4HitCollection.h"
#include "DDG4/Geant4Data.h"
-#include "DDG4/Geant4Hits.h"
+#include "DetSimSD/Geant4Hits.h"
DECLARE_COMPONENT(ExampleAnaElemTool)
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index 1dbfc6f8..f3a9618a 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -2,25 +2,34 @@
find_package(Geant4 REQUIRED ui_all vis_all)
include(${Geant4_USE_FILE})
+gaudi_add_library(DetSimSDLib
+ SOURCES src/Geant4Hits.cpp
+ src/DDG4SensitiveDetector.cpp
+ src/CaloSensitiveDetector.cpp
+ src/DriftChamberSensitiveDetector.cpp
+ src/TimeProjectionChamberSensitiveDetector.cpp
+ src/GenericTrackerSensitiveDetector.cpp
+ src/TrackerCombineSensitiveDetector.cpp
+ LINK DetSimInterface
+ DetInterface
+ ${DD4hep_COMPONENT_LIBRARIES}
+)
+target_include_directories(DetSimSDLib PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+install(TARGETS DetSimSDLib
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
+
gaudi_add_module(DetSimSD
SOURCES src/CalorimeterSensDetTool.cpp
- src/DDG4SensitiveDetector.cpp
- src/CaloSensitiveDetector.cpp
-
src/DriftChamberSensDetTool.cpp
- src/DriftChamberSensitiveDetector.cpp
-
src/TimeProjectionChamberSensDetTool.cpp
- src/TimeProjectionChamberSensitiveDetector.cpp
-
src/GenericTrackerSensDetTool.cpp
- src/GenericTrackerSensitiveDetector.cpp
- src/TrackerCombineSensitiveDetector.cpp
-
- src/Geant4Hits.cpp
-
-
LINK DetSimInterface
+ DetSimSDLib
DetInterface
${DD4hep_COMPONENT_LIBRARIES}
Gaudi::GaudiKernel
diff --git a/Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h b/Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h
index 687771e3..c4a29eb3 100644
--- a/Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h
+++ b/Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h
@@ -15,7 +15,7 @@
#include "DD4hep/Detector.h"
-#include "DDG4/Geant4Hits.h"
+#include "DetSimSD/Geant4Hits.h"
#include "G4Step.hh"
#include "G4HCofThisEvent.hh"
--
GitLab