From d4d2ba1bd2b3d71e0b0627388f3e8afdffa877e8 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 22 Dec 2020 23:21:03 +0800
Subject: [PATCH] WIP: migrate DetDriftChamber.
---
Detector/CMakeLists.txt | 2 +-
Detector/DetDriftChamber/CMakeLists.txt | 16 ++++------------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index a9304fc8..c12aafba 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -1,7 +1,7 @@
# add_subdirectory(DetCEPCv4)
# add_subdirectory(DetCRD)
-# add_subdirectory(DetDriftChamber)
+add_subdirectory(DetDriftChamber)
add_subdirectory(DetEcalMatrix)
add_subdirectory(DetInterface)
add_subdirectory(DetSegmentation)
diff --git a/Detector/DetDriftChamber/CMakeLists.txt b/Detector/DetDriftChamber/CMakeLists.txt
index 0c1cc85b..736dc81a 100644
--- a/Detector/DetDriftChamber/CMakeLists.txt
+++ b/Detector/DetDriftChamber/CMakeLists.txt
@@ -2,11 +2,6 @@
# Package: DetDriftChamber
# Based on package: lcgeo
################################################################################
-gaudi_subdir(DetDriftChamber v0r0)
-
-gaudi_depends_on_subdirs(Detector/DetSegmentation)
-#gaudi_depends_on_subdirs(GaudiKernel)
-
find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
find_package(Geant4)
@@ -17,19 +12,16 @@ include( DD4hep )
find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetDriftChamber)
+# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetDriftChamber)
set(DetDriftChamber_src
src/driftchamber/DriftChamber.cpp
)
gaudi_add_module(DetDriftChamber
- ${DetDriftChamber_src}
- INCLUDE_DIRS
- # DD4hep ROOT Geant4 src/include
- LINK_LIBRARIES GaudiKernel DD4hep ROOT DetSegmentation
- # GaudiKernel
- #DD4hep ${DD4hep_COMPONENT_LIBRARIES}
+ SOURCES ${DetDriftChamber_src}
+ LINK DetSegmentation
+ ${DD4hep_COMPONENT_LIBRARIES}
# ROOT Geant4
)
--
GitLab