From 0a83a6c0100f43a4a24c1e22452f2e58cbd8502e Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 2 Oct 2018 09:42:29 +0200
Subject: [PATCH] ALFA_GeoModel: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
.../ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h | 2 +-
ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h b/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h
index a866b9e2282..672dcf2b152 100755
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/ALFA_GeoModel/ALFA_DetectorManager.h
@@ -41,7 +41,7 @@ class ALFA_DetectorManager : public GeoVDetectorManager
};
#ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
class ALFA_DetectorManager;
CLASS_DEF(ALFA_DetectorManager, 114886926, 1)
#endif
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
index 8e095d42412..c0c2769378a 100644
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/CMakeLists.txt
@@ -8,8 +8,6 @@ atlas_subdir( ALFA_GeoModel )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
- Control/CLIDSvc
- Control/SGTools
Database/AthenaPOOL/AthenaPoolUtilities
Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
@@ -29,7 +27,7 @@ atlas_add_component( ALFA_GeoModel
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools AthenaPoolUtilities GeoModelKernel GeoModelUtilities ALFA_Geometry StoreGateLib SGtests GaudiKernel )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel AthenaPoolUtilities GeoModelKernel GeoModelUtilities ALFA_Geometry StoreGateLib SGtests GaudiKernel )
# Install files from the package:
atlas_install_headers( ALFA_GeoModel )
--
GitLab