Skip to content
Snippets Groups Projects
Commit e220327d authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'sgtools.ISF_FastCaloSimEvent-20190712' into 'master'

ISF_FastCaloSimEvent: SGtools -> AthenaKernel

See merge request atlas/athena!24855
parents 3e53d31c d6c6eb3c
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ atlas_subdir( ISF_FastCaloSimEvent ) ...@@ -10,7 +10,7 @@ atlas_subdir( ISF_FastCaloSimEvent )
atlas_depends_on_subdirs( atlas_depends_on_subdirs(
PUBLIC PUBLIC
Control/AthContainers Control/AthContainers
Control/SGTools Control/AthenaKernel
Calorimeter/CaloGeoHelpers Calorimeter/CaloGeoHelpers
TileCalorimeter/TileSimEvent TileCalorimeter/TileSimEvent
PRIVATE PRIVATE
...@@ -87,7 +87,7 @@ atlas_add_library( ISF_FastCaloSimEvent ...@@ -87,7 +87,7 @@ atlas_add_library( ISF_FastCaloSimEvent
PUBLIC_HEADERS ISF_FastCaloSimEvent PUBLIC_HEADERS ISF_FastCaloSimEvent
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS} DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} AthContainers SGTools LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaKernel
CaloGeoHelpers TileSimEvent CaloGeoHelpers TileSimEvent
PRIVATE_LINK_LIBRARIES GaudiKernel ) PRIVATE_LINK_LIBRARIES GaudiKernel )
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef ISF_FASTCALOSIMEVENT_ISF_FCS_STEPINFOCOLLECTION_H #ifndef ISF_FASTCALOSIMEVENT_ISF_FCS_STEPINFOCOLLECTION_H
...@@ -39,7 +39,7 @@ namespace ISF_FCS_Parametrization { ...@@ -39,7 +39,7 @@ namespace ISF_FCS_Parametrization {
} // namespace ShowerLib } // namespace ShowerLib
#include "SGTools/CLASS_DEF.h" #include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF( ISF_FCS_Parametrization::FCS_StepInfoCollection , 1330006248 , 1 ) CLASS_DEF( ISF_FCS_Parametrization::FCS_StepInfoCollection , 1330006248 , 1 )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment