From 2758da151d349a2e8ae9ce139c22b57c325961a8 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 00:14:51 +0800
Subject: [PATCH] WIP: migrate DetSimSD
---
Simulation/CMakeLists.txt | 2 +-
Simulation/DetSimSD/CMakeLists.txt | 38 ++++++++-----------
.../DetSimSD/CaloSensitiveDetector.h | 0
.../DetSimSD/DDG4SensitiveDetector.h | 0
4 files changed, 17 insertions(+), 23 deletions(-)
rename Simulation/DetSimSD/{ => include}/DetSimSD/CaloSensitiveDetector.h (100%)
rename Simulation/DetSimSD/{ => include}/DetSimSD/DDG4SensitiveDetector.h (100%)
diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
index aecc9173..61b94702 100644
--- a/Simulation/CMakeLists.txt
+++ b/Simulation/CMakeLists.txt
@@ -5,4 +5,4 @@ add_subdirectory(DetSimCore)
#add_subdirectory(DetSimFastModel)
add_subdirectory(DetSimGeom)
add_subdirectory(DetSimInterface)
-#add_subdirectory(DetSimSD)
+add_subdirectory(DetSimSD)
diff --git a/Simulation/DetSimSD/CMakeLists.txt b/Simulation/DetSimSD/CMakeLists.txt
index 33d00e18..82de5e1b 100644
--- a/Simulation/DetSimSD/CMakeLists.txt
+++ b/Simulation/DetSimSD/CMakeLists.txt
@@ -1,12 +1,4 @@
-gaudi_subdir(DetSimSD v0r0)
-
-gaudi_depends_on_subdirs(
- k4FWCore
- Detector/DetInterface
- Simulation/DetSimInterface
-)
-
find_package(Geant4 REQUIRED ui_all vis_all)
include(${Geant4_USE_FILE})
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
@@ -24,18 +16,20 @@ set(DetSimSD_srcs
src/TimeProjectionChamberSensitiveDetector.cpp
)
-gaudi_add_module(DetSimSD ${DetSimSD_srcs}
- INCLUDE_DIRS
- # DetSimInterface
- # k4FWCore
- # DD4hep
- # GaudiKernel
- # Geant4
- LINK_LIBRARIES
- # DetSimInterface
- # k4FWCore
- DD4hep
- ${DD4hep_COMPONENT_LIBRARIES}
- GaudiKernel
- # Geant4
+gaudi_add_module(DetSimSD
+ SOURCES ${DetSimSD_srcs}
+ LINK DetSimInterface
+ DetInterface
+ ${DD4hep_COMPONENT_LIBRARIES}
+ Gaudi::GaudiKernel
)
+target_include_directories(DetSimSD PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/include
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(TARGETS DetSimSD
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
+
diff --git a/Simulation/DetSimSD/DetSimSD/CaloSensitiveDetector.h b/Simulation/DetSimSD/include/DetSimSD/CaloSensitiveDetector.h
similarity index 100%
rename from Simulation/DetSimSD/DetSimSD/CaloSensitiveDetector.h
rename to Simulation/DetSimSD/include/DetSimSD/CaloSensitiveDetector.h
diff --git a/Simulation/DetSimSD/DetSimSD/DDG4SensitiveDetector.h b/Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h
similarity index 100%
rename from Simulation/DetSimSD/DetSimSD/DDG4SensitiveDetector.h
rename to Simulation/DetSimSD/include/DetSimSD/DDG4SensitiveDetector.h
--
GitLab