From dec5631aedf80bb1ce5096938f771bad6fb1c065 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 2 Oct 2018 09:45:46 +0200
Subject: [PATCH] ALFA_Geometry: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
Former-commit-id: 6586d27d7305e8976bb40ad65be6c975faf33ca3
---
.../ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h | 5 +----
ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt | 4 +---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h b/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h
index 46da7124a8b..7405dcdc31f 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/ALFA_Geometry/ALFA_GeometryReader.h
@@ -10,10 +10,7 @@
#include "CLHEP/Geometry/Point3D.h"
#include "GeoModelKernel/GeoTransform.h"
-#include "CLIDSvc/CLASS_DEF.h"
-#ifndef __CINT__
- #include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
#include "ALFA_Geometry/ALFA_ConfigParams.h"
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
index 51ad33c8c42..3910308730c 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/CMakeLists.txt
@@ -8,8 +8,6 @@ atlas_subdir( ALFA_Geometry )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
- Control/CLIDSvc
- Control/SGTools
Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/GeoModel/GeoModelKernel
@@ -29,7 +27,7 @@ atlas_add_library( ALFA_Geometry
PUBLIC_HEADERS ALFA_Geometry
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel SGTools GeoModelKernel GaudiKernel StoreGateLib SGtests
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaKernel GeoModelKernel GaudiKernel StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES PathResolver )
# Install files from the package:
--
GitLab