diff --git a/Simulation/CMakeLists.txt b/Simulation/CMakeLists.txt index cfb46bf8263d096575e4eb32517034438c1735f9..aecc9173169474c78437982669c5607a08d6b375 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 a3b5f3249132d19400359fd728b2dbe676df34a9..87ffb2b14f11d3e03446623af84935967b8aca3e 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 908de073479727ff2b035c8b703ad9e4fca38522..1ad3702f910e3c9643670c76e8fb0891b09291ed 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"