From 6027c10e93d50a3e92110a865ac89f9c357298bb Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 2 Oct 2018 09:33:59 +0200
Subject: [PATCH] AFP_Geometry: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
Former-commit-id: 0667db4cac0af627cfe1f2abd330695886d96f64
---
.../AFP/AFP_Geometry/AFP_Geometry/AFP_Geometry.h | 5 +----
ForwardDetectors/AFP/AFP_Geometry/CMakeLists.txt | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ForwardDetectors/AFP/AFP_Geometry/AFP_Geometry/AFP_Geometry.h b/ForwardDetectors/AFP/AFP_Geometry/AFP_Geometry/AFP_Geometry.h
index 78c316d0ead..7069f519e06 100644
--- a/ForwardDetectors/AFP/AFP_Geometry/AFP_Geometry/AFP_Geometry.h
+++ b/ForwardDetectors/AFP/AFP_Geometry/AFP_Geometry/AFP_Geometry.h
@@ -11,10 +11,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 <list>
#include <map>
diff --git a/ForwardDetectors/AFP/AFP_Geometry/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Geometry/CMakeLists.txt
index 7260cf35897..de155c59036 100644
--- a/ForwardDetectors/AFP/AFP_Geometry/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Geometry/CMakeLists.txt
@@ -7,11 +7,9 @@ atlas_subdir( AFP_Geometry )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
DetectorDescription/GeoModel/GeoModelKernel
PRIVATE
- Control/AthenaKernel
Control/StoreGate
GaudiKernel
Tools/PathResolver )
@@ -25,6 +23,6 @@ atlas_add_library( AFP_Geometry
PUBLIC_HEADERS AFP_Geometry
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} SGTools GeoModelKernel StoreGateLib SGtests
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} GeoModelKernel StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel PathResolver )
--
GitLab