From 146a8122c88fc59b984d8c1f9cc84f5e7eb7b715 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Wed, 23 Dec 2020 00:02:44 +0800
Subject: [PATCH] WIP: migrate DetSimGeom.
---
Simulation/CMakeLists.txt | 2 +-
Simulation/DetSimGeom/CMakeLists.txt | 33 +++++++++----------
.../DetSimGeom/src/AnExampleDetElemTool.h | 2 +-
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt
index cfb46bf8..aecc9173 100644
--- a/Simulation/CMakeLists.txt
+++ b/Simulation/CMakeLists.txt
@@ -3,6 +3,6 @@
add_subdirectory(DetSimCore)
#add_subdirectory(DetSimDedx)
#add_subdirectory(DetSimFastModel)
-#add_subdirectory(DetSimGeom)
+add_subdirectory(DetSimGeom)
add_subdirectory(DetSimInterface)
#add_subdirectory(DetSimSD)
diff --git a/Simulation/DetSimGeom/CMakeLists.txt b/Simulation/DetSimGeom/CMakeLists.txt
index a3b5f324..87ffb2b1 100644
--- a/Simulation/DetSimGeom/CMakeLists.txt
+++ b/Simulation/DetSimGeom/CMakeLists.txt
@@ -1,11 +1,4 @@
-gaudi_subdir(DetSimGeom v0r0)
-
-gaudi_depends_on_subdirs(
- Simulation/DetSimInterface
- Detector/DetInterface
-)
-
find_package(Geant4 REQUIRED ui_all vis_all)
include(${Geant4_USE_FILE})
find_package(DD4hep COMPONENTS DDG4 REQUIRED)
@@ -15,15 +8,19 @@ set(DetSimGeom_srcs
src/AnExampleDetElemTool.cpp
)
-gaudi_add_module(DetSimGeom ${DetSimGeom_srcs}
- INCLUDE_DIRS
- # DetSimInterface
- # DetInterface
- # DD4hep
- # GaudiKernel
- # Geant4
- LINK_LIBRARIES
- DD4hep ${DD4hep_COMPONENT_LIBRARIES}
- GaudiKernel
- # Geant4
+gaudi_add_module(DetSimGeom
+ SOURCES ${DetSimGeom_srcs}
+ LINK DetSimInterface
+ DetInterface
+ ${DD4hep_COMPONENT_LIBRARIES}
+ Gaudi::GaudiKernel
+ ${Geant4_LIBRARIES}
)
+
+install(TARGETS DetSimGeom
+ EXPORT CEPCSWTargets
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
+ COMPONENT dev)
+
+
diff --git a/Simulation/DetSimGeom/src/AnExampleDetElemTool.h b/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
index 908de073..1ad3702f 100644
--- a/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
+++ b/Simulation/DetSimGeom/src/AnExampleDetElemTool.h
@@ -2,7 +2,7 @@
#define AnExampleDetElemTool_h
#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Property.h"
+#include <Gaudi/Property.h>
#include <GaudiKernel/ToolHandle.h>
#include "G4SystemOfUnits.hh"
--
GitLab