From 6e0356d16ce4f5ef78d271576d87bdbbbbfcc4bc Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 22 Dec 2020 23:23:21 +0800
Subject: [PATCH] WIP: migrate DetCRD
---
Detector/CMakeLists.txt | 2 +-
Detector/DetCRD/CMakeLists.txt | 20 +++-----------------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index c12aafba..033e238a 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -1,6 +1,6 @@
# add_subdirectory(DetCEPCv4)
-# add_subdirectory(DetCRD)
+add_subdirectory(DetCRD)
add_subdirectory(DetDriftChamber)
add_subdirectory(DetEcalMatrix)
add_subdirectory(DetInterface)
diff --git a/Detector/DetCRD/CMakeLists.txt b/Detector/DetCRD/CMakeLists.txt
index 3bdd6f88..21610c5a 100644
--- a/Detector/DetCRD/CMakeLists.txt
+++ b/Detector/DetCRD/CMakeLists.txt
@@ -2,10 +2,6 @@
# Package: DetCRD
# CEPC Reference Detector (CRD)
################################################################################
-gaudi_subdir(DetCRD v0r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
-
find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
# find_package(DD4hep)
@@ -17,7 +13,7 @@ include( DD4hep )
find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCRD)
+# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCRD)
set(DetCRD_src
src/Calorimeter/CRDEcal.cpp
@@ -25,18 +21,8 @@ set(DetCRD_src
)
gaudi_add_module(DetCRD
- ${DetCRD_src}
- INCLUDE_DIRS
- # DD4hep
- # ROOT
- # Geant4
- src/include
- LINK_LIBRARIES
- # GaudiKernel
- DD4hep
- ${DD4hep_COMPONENT_LIBRARIES}
- # ROOT
- # Geant4
+ SOURCES ${DetCRD_src}
+ LINK ${DD4hep_COMPONENT_LIBRARIES}
)
set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
--
GitLab