From e8add1768557eb0c3379c82a652190dfe9495351 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Tue, 22 Dec 2020 23:29:52 +0800
Subject: [PATCH] WIP: migrate DetCEPCv4.
---
Detector/CMakeLists.txt | 2 +-
Detector/DetCEPCv4/CMakeLists.txt | 24 +++++++-----------------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt
index 033e238a..be45fff6 100644
--- a/Detector/CMakeLists.txt
+++ b/Detector/CMakeLists.txt
@@ -1,5 +1,5 @@
-# add_subdirectory(DetCEPCv4)
+add_subdirectory(DetCEPCv4)
add_subdirectory(DetCRD)
add_subdirectory(DetDriftChamber)
add_subdirectory(DetEcalMatrix)
diff --git a/Detector/DetCEPCv4/CMakeLists.txt b/Detector/DetCEPCv4/CMakeLists.txt
index 69bcc73e..bc2e5d70 100644
--- a/Detector/DetCEPCv4/CMakeLists.txt
+++ b/Detector/DetCEPCv4/CMakeLists.txt
@@ -3,10 +3,6 @@
# Ref to Package: DetFCCeeIDEA
# Based on package: lcgeo
################################################################################
-gaudi_subdir(DetCEPCv4 v0r0)
-
-gaudi_depends_on_subdirs(GaudiKernel)
-
find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED)
# find_package(DD4hep)
@@ -18,7 +14,7 @@ include( DD4hep )
find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED)
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCEPCv4)
+# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetCEPCv4)
set(DetCEPCv4_src
src/tracker/VXD04_geo.cpp
@@ -40,20 +36,14 @@ set(DetCEPCv4_src
)
gaudi_add_module(DetCEPCv4
- ${DetCEPCv4_src}
- INCLUDE_DIRS
- # DD4hep
- # ROOT
- # Geant4
- src/include
- LINK_LIBRARIES
- # GaudiKernel
- #DD4hep
- ${DD4hep_COMPONENT_LIBRARIES}
- # ROOT
- # Geant4
+ SOURCES ${DetCEPCv4_src}
+ LINK ${DD4hep_COMPONENT_LIBRARIES}
)
+target_include_directories(DetCEPCv4 PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>/src/include
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
message(STATUS "LIBRARY_OUTPUT_PATH -> ${LIBRARY_OUTPUT_PATH}")
dd4hep_generate_rootmap(DetCEPCv4)
--
GitLab