From 9c38174bc920a84eab931586cb5f63f40d8404cb Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 28 Sep 2018 15:00:00 +0200
Subject: [PATCH] GeoModelExamples: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
.../GeoModel/GeoModelExamples/CMakeLists.txt | 7 +++----
.../GeoModelExamples/GeoModelExamples/ToyDetectorManager.h | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelExamples/CMakeLists.txt
index 89cf640b843..4453e6da32d 100644
--- a/DetectorDescription/GeoModel/GeoModelExamples/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelExamples/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( GeoModelExamples )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
DetectorDescription/GeoModel/GeoModelKernel
DetectorDescription/GeoModel/GeoModelUtilities
PRIVATE
@@ -26,11 +25,11 @@ atlas_add_library( GeoModelExamplesLib
PUBLIC_HEADERS GeoModelExamples
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES SGTools GeoModelKernel GeoModelUtilities StoreGateLib SGtests
+ LINK_LIBRARIES GeoModelKernel GeoModelUtilities StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} Identifier GaudiKernel )
atlas_add_component( GeoModelExamples
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} SGTools GeoModelKernel GeoModelUtilities StoreGateLib SGtests Identifier GaudiKernel GeoModelExamplesLib )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} GeoModelKernel GeoModelUtilities StoreGateLib SGtests Identifier GaudiKernel GeoModelExamplesLib )
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/GeoModelExamples/ToyDetectorManager.h b/DetectorDescription/GeoModel/GeoModelExamples/GeoModelExamples/ToyDetectorManager.h
index 96e985e7b30..18a2f2c4d23 100755
--- a/DetectorDescription/GeoModel/GeoModelExamples/GeoModelExamples/ToyDetectorManager.h
+++ b/DetectorDescription/GeoModel/GeoModelExamples/GeoModelExamples/ToyDetectorManager.h
@@ -62,7 +62,7 @@ class ToyDetectorManager : public GeoVDetectorManager {
// Class ToyDetectorManager
#ifndef GAUDI_NEUTRAL
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ToyDetectorManager, 9876, 1)
#endif
--
GitLab