diff --git a/Detector/CMakeLists.txt b/Detector/CMakeLists.txt index 1d966f477864b93b563a9d2218f6bd168ec34028..a9304fc8d0ef66e3b72e93d9fe43d608df9f0316 100644 --- a/Detector/CMakeLists.txt +++ b/Detector/CMakeLists.txt @@ -2,7 +2,7 @@ # add_subdirectory(DetCEPCv4) # add_subdirectory(DetCRD) # add_subdirectory(DetDriftChamber) -# add_subdirectory(DetEcalMatrix) +add_subdirectory(DetEcalMatrix) add_subdirectory(DetInterface) add_subdirectory(DetSegmentation) add_subdirectory(GeomSvc) diff --git a/Detector/DetEcalMatrix/CMakeLists.txt b/Detector/DetEcalMatrix/CMakeLists.txt index 54407d226fed4c44d41a0294e3ac8a8f0ebef1db..5ea62ff40ad7fbae817005332ca1da4240371d5f 100644 --- a/Detector/DetEcalMatrix/CMakeLists.txt +++ b/Detector/DetEcalMatrix/CMakeLists.txt @@ -2,9 +2,6 @@ # Package: DetEcalMatrix # Based on package: lcgeo ################################################################################ -gaudi_subdir(DetEcalMatrix v0r0) - -gaudi_depends_on_subdirs(GaudiKernel) find_package(DD4hep COMPONENTS DDRec DDG4 DDParsers REQUIRED) @@ -16,20 +13,17 @@ include( DD4hep ) find_package(ROOT COMPONENTS MathCore GenVector Geom REQUIRED) -install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetEcalMatrix) +# TODO: how to handle +# install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/compact DESTINATION Detector/DetEcalMatrix) set(DetEcalMatrix_src src/calorimeter/EcalMatrix.cpp ) gaudi_add_module(DetEcalMatrix - ${DetEcalMatrix_src} - INCLUDE_DIRS - # DD4hep ROOT Geant4 src/include - LINK_LIBRARIES - # GaudiKernel - DD4hep ${DD4hep_COMPONENT_LIBRARIES} - # ROOT Geant4 + SOURCES ${DetEcalMatrix_src} + LINK ${DD4hep_COMPONENT_LIBRARIES} + # ROOT Geant4 ) set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})