From 958e236fb864cbfdf933f1cc27d02905076507b1 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 20 Oct 2018 17:15:09 +0200
Subject: [PATCH] LArDetDescrr: CLIDSvc -> AthenaKernel
Update references to headers in CLIDSvc moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
Former-commit-id: c8ba4ebe5c5ce7eb8a1ec4b4b6ab6b398dad5ca0
---
LArCalorimeter/LArDetDescr/CMakeLists.txt | 5 ++---
LArCalorimeter/LArDetDescr/LArDetDescr/LArCellVolumeDB.h | 6 ++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/LArCalorimeter/LArDetDescr/CMakeLists.txt b/LArCalorimeter/LArDetDescr/CMakeLists.txt
index b49269de187..173c20bf3e9 100644
--- a/LArCalorimeter/LArDetDescr/CMakeLists.txt
+++ b/LArCalorimeter/LArDetDescr/CMakeLists.txt
@@ -10,8 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloDetDescr
Calorimeter/CaloGeoHelpers
Control/AthenaBaseComps
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/Identifier
GaudiKernel
@@ -35,7 +34,7 @@ atlas_add_component( LArDetDescr
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloDetDescrLib CaloGeoHelpers AthenaBaseComps SGTools GeoModelKernel Identifier GaudiKernel LArReadoutGeometry CaloIdentifier StoreGateLib SGtests GeoModelUtilities GeoPrimitives )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaKernel CaloDetDescrLib CaloGeoHelpers AthenaBaseComps GeoModelKernel Identifier GaudiKernel LArReadoutGeometry CaloIdentifier StoreGateLib SGtests GeoModelUtilities GeoPrimitives )
# Install files from the package:
atlas_install_headers( LArDetDescr )
diff --git a/LArCalorimeter/LArDetDescr/LArDetDescr/LArCellVolumeDB.h b/LArCalorimeter/LArDetDescr/LArDetDescr/LArCellVolumeDB.h
index 380a69413bf..f4c13272a35 100755
--- a/LArCalorimeter/LArDetDescr/LArDetDescr/LArCellVolumeDB.h
+++ b/LArCalorimeter/LArDetDescr/LArDetDescr/LArCellVolumeDB.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef LARDETDESCR_LARCELLVOLUMEDB_H
@@ -28,9 +28,7 @@ struct LArCellVolumeDB_t{
typedef std::vector<LArCellVolumeDB_t> LArCellVolumeDB;
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(LArCellVolumeDB, 34482670 ,1)
-#endif
#endif
--
GitLab